Moving source and test into standard maven directories
diff --git a/pom.xml b/pom.xml
index b26041b..3458aca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,8 +116,6 @@
   </dependencies> 
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
     <resources>
       <resource>
         <directory>src</directory>
diff --git a/src/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java b/src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
rename to src/main/java/javax/servlet/jsp/jstl/core/ConditionalTagSupport.java
diff --git a/src/javax/servlet/jsp/jstl/core/Config.java b/src/main/java/javax/servlet/jsp/jstl/core/Config.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/Config.java
rename to src/main/java/javax/servlet/jsp/jstl/core/Config.java
diff --git a/src/javax/servlet/jsp/jstl/core/IndexedValueExpression.java b/src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/IndexedValueExpression.java
rename to src/main/java/javax/servlet/jsp/jstl/core/IndexedValueExpression.java
diff --git a/src/javax/servlet/jsp/jstl/core/IteratedExpression.java b/src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/IteratedExpression.java
rename to src/main/java/javax/servlet/jsp/jstl/core/IteratedExpression.java
diff --git a/src/javax/servlet/jsp/jstl/core/IteratedValueExpression.java b/src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/IteratedValueExpression.java
rename to src/main/java/javax/servlet/jsp/jstl/core/IteratedValueExpression.java
diff --git a/src/javax/servlet/jsp/jstl/core/LoopTag.java b/src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/LoopTag.java
rename to src/main/java/javax/servlet/jsp/jstl/core/LoopTag.java
diff --git a/src/javax/servlet/jsp/jstl/core/LoopTagStatus.java b/src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/LoopTagStatus.java
rename to src/main/java/javax/servlet/jsp/jstl/core/LoopTagStatus.java
diff --git a/src/javax/servlet/jsp/jstl/core/LoopTagSupport.java b/src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/core/LoopTagSupport.java
rename to src/main/java/javax/servlet/jsp/jstl/core/LoopTagSupport.java
diff --git a/src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java b/src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
rename to src/main/java/javax/servlet/jsp/jstl/fmt/LocaleSupport.java
diff --git a/src/javax/servlet/jsp/jstl/fmt/LocalizationContext.java b/src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
rename to src/main/java/javax/servlet/jsp/jstl/fmt/LocalizationContext.java
diff --git a/src/javax/servlet/jsp/jstl/sql/Result.java b/src/main/java/javax/servlet/jsp/jstl/sql/Result.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/sql/Result.java
rename to src/main/java/javax/servlet/jsp/jstl/sql/Result.java
diff --git a/src/javax/servlet/jsp/jstl/sql/ResultImpl.java b/src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/sql/ResultImpl.java
rename to src/main/java/javax/servlet/jsp/jstl/sql/ResultImpl.java
diff --git a/src/javax/servlet/jsp/jstl/sql/ResultSupport.java b/src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/sql/ResultSupport.java
rename to src/main/java/javax/servlet/jsp/jstl/sql/ResultSupport.java
diff --git a/src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java b/src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
rename to src/main/java/javax/servlet/jsp/jstl/sql/SQLExecutionTag.java
diff --git a/src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java b/src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
rename to src/main/java/javax/servlet/jsp/jstl/tlv/PermittedTaglibsTLV.java
diff --git a/src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java b/src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
similarity index 100%
rename from src/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
rename to src/main/java/javax/servlet/jsp/jstl/tlv/ScriptFreeTLV.java
diff --git a/src/org/apache/taglibs/standard/Version.java b/src/main/java/org/apache/taglibs/standard/Version.java
similarity index 100%
rename from src/org/apache/taglibs/standard/Version.java
rename to src/main/java/org/apache/taglibs/standard/Version.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/BoundedMap.java b/src/main/java/org/apache/taglibs/standard/extra/collections/BoundedMap.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/BoundedMap.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/BoundedMap.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/IterableMap.java b/src/main/java/org/apache/taglibs/standard/extra/collections/IterableMap.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/IterableMap.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/IterableMap.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/KeyValue.java b/src/main/java/org/apache/taglibs/standard/extra/collections/KeyValue.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/KeyValue.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/KeyValue.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/MapIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/MapIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/MapIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/MapIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/OrderedIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/OrderedIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/OrderedIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/OrderedIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/OrderedMap.java b/src/main/java/org/apache/taglibs/standard/extra/collections/OrderedMap.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/OrderedMap.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/OrderedMap.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/OrderedMapIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/README.txt b/src/main/java/org/apache/taglibs/standard/extra/collections/README.txt
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/README.txt
rename to src/main/java/org/apache/taglibs/standard/extra/collections/README.txt
diff --git a/src/org/apache/taglibs/standard/extra/collections/ResettableIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/ResettableIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/ResettableIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/ResettableIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/iterators/AbstractEmptyIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyMapIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/iterators/EmptyOrderedMapIterator.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java b/src/main/java/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/map/AbstractHashedMap.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java b/src/main/java/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/map/AbstractLinkedMap.java
diff --git a/src/org/apache/taglibs/standard/extra/collections/map/LRUMap.java b/src/main/java/org/apache/taglibs/standard/extra/collections/map/LRUMap.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/collections/map/LRUMap.java
rename to src/main/java/org/apache/taglibs/standard/extra/collections/map/LRUMap.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/ASCII_CharStream.java b/src/main/java/org/apache/taglibs/standard/extra/spath/ASCII_CharStream.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/ASCII_CharStream.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/ASCII_CharStream.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/ASCII_UCodeESC_CharStream.java b/src/main/java/org/apache/taglibs/standard/extra/spath/ASCII_UCodeESC_CharStream.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/ASCII_UCodeESC_CharStream.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/ASCII_UCodeESC_CharStream.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/AbsolutePath.java b/src/main/java/org/apache/taglibs/standard/extra/spath/AbsolutePath.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/AbsolutePath.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/AbsolutePath.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/AttributePredicate.java b/src/main/java/org/apache/taglibs/standard/extra/spath/AttributePredicate.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/AttributePredicate.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/AttributePredicate.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/ParseException.java b/src/main/java/org/apache/taglibs/standard/extra/spath/ParseException.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/ParseException.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/ParseException.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/Path.java b/src/main/java/org/apache/taglibs/standard/extra/spath/Path.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/Path.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/Path.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/Predicate.java b/src/main/java/org/apache/taglibs/standard/extra/spath/Predicate.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/Predicate.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/Predicate.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/RelativePath.java b/src/main/java/org/apache/taglibs/standard/extra/spath/RelativePath.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/RelativePath.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/RelativePath.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathFilter.java b/src/main/java/org/apache/taglibs/standard/extra/spath/SPathFilter.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/SPathFilter.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/SPathFilter.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathParser.java b/src/main/java/org/apache/taglibs/standard/extra/spath/SPathParser.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/SPathParser.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/SPathParser.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathParser.jj b/src/main/java/org/apache/taglibs/standard/extra/spath/SPathParser.jj
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/SPathParser.jj
rename to src/main/java/org/apache/taglibs/standard/extra/spath/SPathParser.jj
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathParserConstants.java b/src/main/java/org/apache/taglibs/standard/extra/spath/SPathParserConstants.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/SPathParserConstants.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/SPathParserConstants.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathParserTokenManager.java b/src/main/java/org/apache/taglibs/standard/extra/spath/SPathParserTokenManager.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/SPathParserTokenManager.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/SPathParserTokenManager.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/SPathTag.java b/src/main/java/org/apache/taglibs/standard/extra/spath/SPathTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/SPathTag.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/SPathTag.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/Step.java b/src/main/java/org/apache/taglibs/standard/extra/spath/Step.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/Step.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/Step.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/Token.java b/src/main/java/org/apache/taglibs/standard/extra/spath/Token.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/Token.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/Token.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/TokenMgrError.java b/src/main/java/org/apache/taglibs/standard/extra/spath/TokenMgrError.java
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/TokenMgrError.java
rename to src/main/java/org/apache/taglibs/standard/extra/spath/TokenMgrError.java
diff --git a/src/org/apache/taglibs/standard/extra/spath/spath.tld b/src/main/java/org/apache/taglibs/standard/extra/spath/spath.tld
similarity index 100%
rename from src/org/apache/taglibs/standard/extra/spath/spath.tld
rename to src/main/java/org/apache/taglibs/standard/extra/spath/spath.tld
diff --git a/src/org/apache/taglibs/standard/functions/Functions.java b/src/main/java/org/apache/taglibs/standard/functions/Functions.java
similarity index 100%
rename from src/org/apache/taglibs/standard/functions/Functions.java
rename to src/main/java/org/apache/taglibs/standard/functions/Functions.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/AndOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/AndOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/AndOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/AndOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ArithmeticOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoIndexedProperty.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoManager.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/BeanInfoProperty.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/BooleanLiteral.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Coercions.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Coercions.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Coercions.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ComplexValue.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Constants.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/Constants.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Constants.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Constants.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/DivideOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/DivideOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/DivideOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/DivideOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ELException.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ELException.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ELException.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ELException.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ELParser.jj b/src/main/java/org/apache/taglibs/standard/lang/jstl/ELParser.jj
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ELParser.jj
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ELParser.jj
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/EmptyOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/EnumeratedMap.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/EqualityOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/EqualsOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Evaluator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Evaluator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Evaluator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Expression.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/Expression.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Expression.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Expression.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ExpressionString.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/FloatingPointLiteral.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/GreaterThanOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/GreaterThanOrEqualsOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ImplicitObjects.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/IntegerDivideOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/IntegerLiteral.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/JSTLVariableResolver.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/LessThanOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/LessThanOrEqualsOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Literal.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/Literal.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Literal.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Literal.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Logger.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Logger.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Logger.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/MinusOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/MinusOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/MinusOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/MinusOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ModulusOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/MultiplyOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NamedValue.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/NamedValue.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/NamedValue.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/NamedValue.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/NotEqualsOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NotOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/NotOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/NotOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/NotOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/NullLiteral.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/NullLiteral.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/NullLiteral.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/NullLiteral.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/OrOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/OrOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/OrOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/OrOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/PlusOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/PlusOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/PlusOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/PlusOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/PrimitiveObjects.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/PropertySuffix.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/RelationalOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Resources.properties b/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources.properties
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Resources.properties
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Resources.properties
diff --git a/src/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties b/src/main/java/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/Resources_ja.properties
diff --git a/src/org/apache/taglibs/standard/lang/jstl/StringLiteral.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperator.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/ValueSuffix.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/VariableResolver.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/VariableResolver.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/parser/SimpleCharStream.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/parser/Token.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/parser/Token.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/parser/Token.java
diff --git a/src/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java b/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
rename to src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
diff --git a/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java b/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
rename to src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluator.java
diff --git a/src/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java b/src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
similarity index 100%
rename from src/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
rename to src/main/java/org/apache/taglibs/standard/lang/support/ExpressionEvaluatorManager.java
diff --git a/src/org/apache/taglibs/standard/resources/Resources.java b/src/main/java/org/apache/taglibs/standard/resources/Resources.java
similarity index 100%
rename from src/org/apache/taglibs/standard/resources/Resources.java
rename to src/main/java/org/apache/taglibs/standard/resources/Resources.java
diff --git a/src/org/apache/taglibs/standard/resources/Resources.properties b/src/main/java/org/apache/taglibs/standard/resources/Resources.properties
similarity index 100%
rename from src/org/apache/taglibs/standard/resources/Resources.properties
rename to src/main/java/org/apache/taglibs/standard/resources/Resources.properties
diff --git a/src/org/apache/taglibs/standard/resources/Resources_ja.properties b/src/main/java/org/apache/taglibs/standard/resources/Resources_ja.properties
similarity index 100%
rename from src/org/apache/taglibs/standard/resources/Resources_ja.properties
rename to src/main/java/org/apache/taglibs/standard/resources/Resources_ja.properties
diff --git a/src/org/apache/taglibs/standard/tag/common/core/CatchTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/CatchTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/CatchTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ChooseTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/ChooseTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/DeclareTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/DeclareTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/ForTokensSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/NullAttributeException.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/OtherwiseTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/OutSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/OutSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ParamParent.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamParent.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/ParamParent.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/ParamParent.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/ParamSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/RedirectSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/RemoveTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/RemoveTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/SetSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/SetSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/Util.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/Util.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
diff --git a/src/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/core/WhenTagSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/MessageSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParamSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseDateSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/ParseNumberSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/RequestEncodingSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/DateParamTagSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/DriverTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/DriverTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/DriverTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/DriverTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/ResultImpl.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/ExprSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/ForEachTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/IfTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/IfTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/IfTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLPrefixResolver.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLXPathAPI.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/ParamSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/SetTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/SetTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/SetTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/UnresolvableException.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/WhenTag.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/WhenTag.java
diff --git a/src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java b/src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
rename to src/main/java/org/apache/taglibs/standard/tag/common/xml/XPathUtil.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/ExpressionUtil.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ForEachTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/ForEachTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/ForTokensTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/IfTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/IfTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/IfTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/IfTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ImportTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/ImportTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/ImportTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/ImportTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/OutTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/OutTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/OutTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/RedirectTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/RedirectTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/SetTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/SetTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/SetTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/UrlTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/UrlTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/UrlTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/UrlTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/core/WhenTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/core/WhenTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/core/WhenTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/core/WhenTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/BundleTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatDateTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/FormatNumberTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/MessageTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseDateTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/ParseNumberTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/RequestEncodingTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetBundleTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetLocaleTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/SetTimeZoneTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/fmt/TimeZoneTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/sql/DateParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/sql/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/sql/SetDataSourceTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/sql/TransactionTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/sql/UpdateTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/ExprTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/xml/ExprTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/xml/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/ParseTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/xml/ParseTag.java
diff --git a/src/org/apache/taglibs/standard/tag/el/xml/TransformTag.java b/src/main/java/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/el/xml/TransformTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/ForEachTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/ForTokensTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/IfTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/IfTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/IfTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ImportTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/ImportTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/OutTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/OutTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/OutTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/RedirectTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/SetTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/SetTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/SetTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/UrlTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/UrlTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/core/WhenTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/core/WhenTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/BundleTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatDateTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/FormatNumberTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/MessageTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseDateTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/ParseNumberTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/RequestEncodingTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetBundleTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetLocaleTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/SetTimeZoneTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/fmt/TimeZoneTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/sql/DateParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/sql/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/sql/QueryTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/sql/SetDataSourceTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/sql/TransactionTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/sql/UpdateTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/xml/ExprTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParamTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/xml/ParseTag.java
diff --git a/src/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java b/src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
rename to src/main/java/org/apache/taglibs/standard/tag/rt/xml/TransformTag.java
diff --git a/src/org/apache/taglibs/standard/tei/DeclareTEI.java b/src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tei/DeclareTEI.java
rename to src/main/java/org/apache/taglibs/standard/tei/DeclareTEI.java
diff --git a/src/org/apache/taglibs/standard/tei/ForEachTEI.java b/src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tei/ForEachTEI.java
rename to src/main/java/org/apache/taglibs/standard/tei/ForEachTEI.java
diff --git a/src/org/apache/taglibs/standard/tei/ImportTEI.java b/src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tei/ImportTEI.java
rename to src/main/java/org/apache/taglibs/standard/tei/ImportTEI.java
diff --git a/src/org/apache/taglibs/standard/tei/Util.java b/src/main/java/org/apache/taglibs/standard/tei/Util.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tei/Util.java
rename to src/main/java/org/apache/taglibs/standard/tei/Util.java
diff --git a/src/org/apache/taglibs/standard/tei/XmlParseTEI.java b/src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tei/XmlParseTEI.java
rename to src/main/java/org/apache/taglibs/standard/tei/XmlParseTEI.java
diff --git a/src/org/apache/taglibs/standard/tei/XmlTransformTEI.java b/src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tei/XmlTransformTEI.java
rename to src/main/java/org/apache/taglibs/standard/tei/XmlTransformTEI.java
diff --git a/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java b/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
rename to src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
diff --git a/src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java b/src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
rename to src/main/java/org/apache/taglibs/standard/tlv/JstlCoreTLV.java
diff --git a/src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java b/src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
rename to src/main/java/org/apache/taglibs/standard/tlv/JstlFmtTLV.java
diff --git a/src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java b/src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
rename to src/main/java/org/apache/taglibs/standard/tlv/JstlSqlTLV.java
diff --git a/src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java b/src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
similarity index 100%
rename from src/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
rename to src/main/java/org/apache/taglibs/standard/tlv/JstlXmlTLV.java
diff --git a/test/org/apache/taglibs/standard/TestVersion.java b/src/test/java/org/apache/taglibs/standard/TestVersion.java
similarity index 100%
rename from test/org/apache/taglibs/standard/TestVersion.java
rename to src/test/java/org/apache/taglibs/standard/TestVersion.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/Bean1.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean1.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/Bean2.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/Bean2.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/Bean2Editor.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/EvaluationTest.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/ParserTest.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/StaticFunctionTests.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/Factory.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean1a.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2b.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2c.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PrivateBean2d.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean1b.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicBean2a.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/beans/PublicInterface2.java
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/evaluationTests.txt b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/evaluationTests.txt
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/evaluationTests.txt
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/evaluationTests.txt
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/evaluationTestsOutput.txt b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/evaluationTestsOutput.txt
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/evaluationTestsOutput.txt
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/evaluationTestsOutput.txt
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/parserTests.txt b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTests.txt
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/parserTests.txt
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTests.txt
diff --git a/test/org/apache/taglibs/standard/lang/jstl/test/parserTestsOutput.txt b/src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTestsOutput.txt
similarity index 100%
rename from test/org/apache/taglibs/standard/lang/jstl/test/parserTestsOutput.txt
rename to src/test/java/org/apache/taglibs/standard/lang/jstl/test/parserTestsOutput.txt
diff --git a/test/org/apache/taglibs/standard/testutil/TestUtil.java b/src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java
similarity index 100%
rename from test/org/apache/taglibs/standard/testutil/TestUtil.java
rename to src/test/java/org/apache/taglibs/standard/testutil/TestUtil.java