diff --git a/.classpath b/.classpath deleted file mode 100644 index ec5f3187ab..0000000000 --- a/.classpath +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.project b/.project deleted file mode 100644 index 274051f30a..0000000000 --- a/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - ApachePOI - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.sonar.ide.eclipse.core.sonarNature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/com.vaadin.designer.prefs b/.settings/com.vaadin.designer.prefs deleted file mode 100644 index 83e545c06d..0000000000 --- a/.settings/com.vaadin.designer.prefs +++ /dev/null @@ -1,2 +0,0 @@ -applicationTheme=Project structure is not supported. -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 4824b80263..0000000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 18eea4af5d..0000000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,419 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes= -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 5227bd2854..0000000000 --- a/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,131 +0,0 @@ -cleanup.add_default_serial_version_id=true -cleanup.add_generated_serial_version_id=false -cleanup.add_missing_annotations=true -cleanup.add_missing_deprecated_annotations=true -cleanup.add_missing_methods=false -cleanup.add_missing_nls_tags=false -cleanup.add_missing_override_annotations=true -cleanup.add_missing_override_annotations_interface_methods=true -cleanup.add_serial_version_id=false -cleanup.always_use_blocks=true -cleanup.always_use_parentheses_in_expressions=false -cleanup.always_use_this_for_non_static_field_access=false -cleanup.always_use_this_for_non_static_method_access=false -cleanup.convert_functional_interfaces=false -cleanup.convert_to_enhanced_for_loop=false -cleanup.correct_indentation=false -cleanup.format_source_code=false -cleanup.format_source_code_changes_only=false -cleanup.insert_inferred_type_arguments=false -cleanup.make_local_variable_final=true -cleanup.make_parameters_final=false -cleanup.make_private_fields_final=true -cleanup.make_type_abstract_if_missing_method=false -cleanup.make_variable_declarations_final=false -cleanup.never_use_blocks=false -cleanup.never_use_parentheses_in_expressions=true -cleanup.organize_imports=false -cleanup.qualify_static_field_accesses_with_declaring_class=false -cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -cleanup.qualify_static_member_accesses_with_declaring_class=true -cleanup.qualify_static_method_accesses_with_declaring_class=false -cleanup.remove_private_constructors=true -cleanup.remove_redundant_type_arguments=true -cleanup.remove_trailing_whitespaces=false -cleanup.remove_trailing_whitespaces_all=true -cleanup.remove_trailing_whitespaces_ignore_empty=false -cleanup.remove_unnecessary_casts=true -cleanup.remove_unnecessary_nls_tags=true -cleanup.remove_unused_imports=true -cleanup.remove_unused_local_variables=false -cleanup.remove_unused_private_fields=true -cleanup.remove_unused_private_members=false -cleanup.remove_unused_private_methods=true -cleanup.remove_unused_private_types=true -cleanup.sort_members=false -cleanup.sort_members_all=false -cleanup.use_anonymous_class_creation=false -cleanup.use_blocks=false -cleanup.use_blocks_only_for_return_and_throw=false -cleanup.use_lambda=true -cleanup.use_parentheses_in_expressions=false -cleanup.use_this_for_non_static_field_access=false -cleanup.use_this_for_non_static_field_access_only_if_necessary=true -cleanup.use_this_for_non_static_method_access=false -cleanup.use_this_for_non_static_method_access_only_if_necessary=true -cleanup.use_type_arguments=false -cleanup_profile=_Apache POI -cleanup_settings_version=2 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false -formatter_profile=_Apache POI -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com; -org.eclipse.jdt.ui.javadoc=false -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=20 -org.eclipse.jdt.ui.overrideannotation=false -org.eclipse.jdt.ui.staticondemandthreshold=10 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=true -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=false -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=false -sp_cleanup.organize_imports=false -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=true -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=true -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_type_arguments=false diff --git a/.settings/org.moreunit.core.prefs b/.settings/org.moreunit.core.prefs deleted file mode 100644 index efd9d77f2e..0000000000 --- a/.settings/org.moreunit.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.moreunit.core.anyLanguage.srcFolderPathTemplate=${srcProject} -org.moreunit.core.anyLanguage.testFileNameTemplate=${srcFile}Test -org.moreunit.core.anyLanguage.testFolderPathTemplate=${srcProject} diff --git a/.settings/org.moreunit.prefs b/.settings/org.moreunit.prefs deleted file mode 100644 index 659afaf8c2..0000000000 --- a/.settings/org.moreunit.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.moreunit.preferences.version=2 -org.moreunit.unitsourcefolder=ApachePOI\:src/java\:ApachePOI\:src/testcases\#ApachePOI\:src/java\:ApachePOI\:src/ooxml/testcases\#ApachePOI\:src/java\:ApachePOI\:src/scratchpad/testcases\#ApachePOI\:src/java\:ApachePOI\:src/excelant/testcases\#ApachePOI\:src/java\:ApachePOI\:src/integrationtest -org.moreunit.useprojectsettings=true diff --git a/build.gradle b/build.gradle index 4247631df4..df2d2ba6d7 100644 --- a/build.gradle +++ b/build.gradle @@ -163,7 +163,7 @@ subprojects { // http://forums.gradle.org/gradle/topics/jacoco_related_failure_in_multiproject_build systemProperties['user.dir'] = workingDir - systemProperties['POI.testdata.path'] = '../../test-data' + systemProperties['POI.testdata.path'] = '../test-data' // this is necessary for JDK 9+ to keep formatting dates the same way as in previous JDK-versions systemProperties['java.locale.providers'] = 'JRE,CLDR' @@ -195,7 +195,7 @@ subprojects { properties { // as we currently use build// as project-basedir, we need to tell Sonar to use // the root-folder as "basedir" for the projects - property "sonar.projectBaseDir", "$projectDir/../.." + property "sonar.projectBaseDir", "$projectDir" // currently supported providers on Jenkins: "hg,git": property "sonar.scm.provider", "svn" // the plugin seems to not detect our non-standard build-layout @@ -213,208 +213,4 @@ subprojects { txtOutputFile = file("$buildDir/reports/japi.txt") htmlOutputFile = file("$buildDir/reports/japi.html") } -} - -project('main') { - sourceSets.main.java.srcDirs = ['../../src/java'] - sourceSets.main.resources.srcDirs = ['../../src/resources/main'] - sourceSets.test.java.srcDirs = ['../../src/testcases'] - sourceSets.test.resources.srcDirs = ['../../src/resources/test'] - - dependencies { - implementation "commons-codec:commons-codec:${commonsCodecVersion}" - implementation 'org.apache.commons:commons-collections4:4.4' - implementation "org.apache.commons:commons-math3:${commonsMathVersion}" - implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" - implementation 'javax.activation:activation:1.1.1' - api 'com.zaxxer:SparseBitSet:1.2' - - testImplementation 'org.reflections:reflections:0.9.12' - } - - jar { - manifest { - attributes 'Automatic-Module-Name': 'org.apache.poi.main' - } - } - - // Create a separate jar for test-code to depend on it in other projects - // See http://stackoverflow.com/questions/5144325/gradle-test-dependency - task testJar(type: Jar, dependsOn: testClasses) { - baseName = "test-${project.archivesBaseName}" - from sourceSets.test.output - } - - configurations { - tests - } - - artifacts { - tests testJar - } - - japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" -} - -project('ooxml') { - - sourceSets.main.java.srcDirs = ['../../src/ooxml/java'] - sourceSets.main.resources.srcDirs = ['../../src/ooxml/resources', '../../src/resources/ooxml'] - sourceSets.test.java.srcDirs = ['../../src/ooxml/testcases'] - sourceSets.test.resources.srcDirs = ['../../src/resources/test'] - - configurations { - antdep - } - - dependencies { - antdep 'org.apache.ant:ant:1.10.9' - } - - // we need to ensure that the custom ant tasks are compiled before we import the build.xml file - ant.mkdir(dir: "../../build/poi-ant-contrib") - ant.javac(srcdir: "../../src/excelant/poi-ant-contrib" - , destdir: "../../build/poi-ant-contrib" - , classpath: configurations.antdep.asPath - , includeantruntime: "true" - , excludes: "Junit5Progress.java" - ) - - // for now import the ant-task for building the jars from build.xml - // we need to rename the tasks as e.g. task "jar" conflicts with :ooxml:jar - ant.importBuild('../../build.xml') { antTargetName -> - 'ant-' + antTargetName - } - compileJava.dependsOn 'ant-compile-ooxml-xsds' - - dependencies { - api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" - implementation 'org.apache.commons:commons-collections4:4.4' - api "org.apache.commons:commons-compress:${commonsCompressVersion}" - api 'org.apache.santuario:xmlsec:2.2.1' - api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" - api 'com.github.virtuald:curvesapi:1.06' - implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" - - api "org.apache.xmlgraphics:batik-svggen:${batikVersion}" - implementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { - exclude group: 'org.apache.xmlgraphics', module: 'batik-script' - } - implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}" - - api 'de.rototor.pdfbox:graphics2d:0.31' - - api project(':main') - api files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar") - - testRuntime project(':scratchpad') - testImplementation 'org.xmlunit:xmlunit-core:2.8.0' - testImplementation 'org.reflections:reflections:0.9.12' - testImplementation project(path: ':main', configuration: 'tests') - testImplementation 'org.openjdk.jmh:jmh-core:1.26' - testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26' - testImplementation 'com.google.guava:guava:30.0-jre' - } - - jar { - manifest { - attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml' - } - } - - japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" - - test { - // for some reason catching the OOM does not work when run from Gradle - exclude '**/MemoryUsage.class' - } -} - -project('examples') { - sourceSets.main.java.srcDirs = ['../../src/examples/src'] - - dependencies { - implementation project(':ooxml') - implementation project(':scratchpad') - - implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}" - } - - japicmp.enabled = false -} - - -project('excelant') { - sourceSets.main.java.srcDirs = ['../../src/excelant/java'] - sourceSets.main.resources.srcDirs = ['../../src/excelant/resources'] - sourceSets.test.java.srcDirs = ['../../src/excelant/testcases'] - sourceSets.test.resources.srcDirs = ['../../src/resources/test'] - - dependencies { - api 'org.apache.ant:ant:1.10.9' - - api project(':ooxml') - - testImplementation project(path: ':main', configuration: 'tests') - } - - jar { - manifest { - attributes 'Automatic-Module-Name': 'org.apache.poi.excelant' - } - } - - japicmp.baseline = "org.apache.poi:poi-excelant:${japicmpversion}@jar" -} - -project('integrationtest') { - sourceSets.test.java.srcDirs = ['../../src/integrationtest'] - sourceSets.test.resources.srcDirs = ['../../src/resources/integrationtest'] - - dependencies { - testImplementation 'org.apache.ant:ant:1.10.9' - - testImplementation project(':ooxml') - testImplementation project(':scratchpad') - testImplementation project(':examples') - - testImplementation files(this.project(':ooxml').sourceSets.test.runtimeClasspath) - } - - jar { - manifest { - attributes 'Automatic-Module-Name': 'org.apache.poi.integrationtest' - } - } - - test { - // exclude these from the normal test-run - exclude '**/*FileHandler.class' - } - - japicmp.enabled = false -} - -project('scratchpad') { - sourceSets.main.java.srcDirs = ['../../src/scratchpad/src'] - sourceSets.main.resources.srcDirs = ['../../src/resources/scratchpad'] - sourceSets.test.java.srcDirs = ['../../src/scratchpad/testcases'] - sourceSets.test.resources.srcDirs = ['../../src/resources/test'] - - dependencies { - api project(':main') - implementation "commons-codec:commons-codec:${commonsCodecVersion}" - implementation "org.apache.commons:commons-math3:${commonsMathVersion}" - implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" - - testImplementation project(path: ':main', configuration: 'tests') - } - - jar { - manifest { - attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad' - } - } - - japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" -} +} \ No newline at end of file diff --git a/build.xml b/build.xml index 509288ab31..8ea0ec80ca 100644 --- a/build.xml +++ b/build.xml @@ -89,9 +89,9 @@ under the License. - - - + + + @@ -115,66 +115,65 @@ under the License. - - - - + + + + - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + - - + + - - - - - - - - + + + + + + + + - + - - - - - + + + + + - - - - - - - - + + + + + + + + @@ -348,18 +347,21 @@ under the License. - - + + + + + + - - - - - + + + + @@ -591,9 +593,12 @@ under the License. - + + + + @@ -618,6 +623,13 @@ under the License. + + + + + + + @@ -908,11 +920,9 @@ under the License. - - - + - + @@ -921,13 +931,6 @@ under the License. - - - - - - - @@ -937,10 +940,10 @@ under the License. + + + - + - - + + + @@ -996,8 +1003,8 @@ under the License. - - + + @@ -1032,7 +1039,7 @@ under the License. @{module} - + @@ -1053,8 +1060,8 @@ under the License. @@ -1070,7 +1077,7 @@ under the License. - @@ -1112,8 +1119,8 @@ under the License. @@ -1131,7 +1138,7 @@ under the License. - + @@ -1151,8 +1158,6 @@ under the License. - - @@ -1168,7 +1173,7 @@ under the License. - @@ -1176,7 +1181,7 @@ under the License. - + @@ -1194,7 +1199,7 @@ under the License. - + @@ -1232,17 +1237,14 @@ under the License. - + - - - - + @@ -1302,8 +1304,8 @@ under the License. - - + @@ -1338,7 +1340,7 @@ under the License. - + @@ -1424,7 +1426,7 @@ under the License. - + @@ -1457,7 +1459,7 @@ under the License. - + + manifest="integrationtest/build/poi-manifest.mf"/> - + @@ -1499,11 +1501,11 @@ under the License. depends="init, -version-java-check" description="Compiles the version class"> - - - + + + + + @@ -1513,12 +1515,9 @@ under the License. - - - @@ -1653,8 +1652,8 @@ under the License. - - + + @@ -1822,7 +1821,7 @@ under the License. - + @@ -1831,11 +1830,11 @@ under the License. - ${full.schema}${lite.exports}} + ${full.schema}${lite.exports}} @@ -1870,7 +1869,7 @@ under the License. - + @@ -2141,20 +2140,6 @@ under the License. Use ant dist-nexus to deploy the artifacts in the remote repository - - - - - - - - - - - - - - @@ -2187,7 +2172,7 @@ under the License. - + + + + + + + + + + + + + @@ -2329,7 +2326,7 @@ under the License. - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - @@ -2525,13 +2525,17 @@ under the License. --> - - - - - - - + + + + + + + + + + + @@ -2542,11 +2546,11 @@ under the License. > - - - - - + + + + + @@ -2686,9 +2690,11 @@ under the License. - - - + + + + + @@ -2914,7 +2920,7 @@ under the License. - + @@ -3038,7 +3044,7 @@ under the License. - + - - SubRecord - SubRecord - The end data record is used to denote the end of the subrecords. - Glen Stampoultzis (glens at apache.org) - - - +==================================================================== */ + +dependencies { + implementation project(':ooxml') + implementation project(':scratchpad') + + implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}" +} + +japicmp.enabled = false \ No newline at end of file diff --git a/src/examples/clojure/SpreadSheetDemo.clj b/examples/src/main/clojure/SpreadSheetDemo.clj similarity index 100% rename from src/examples/clojure/SpreadSheetDemo.clj rename to examples/src/main/clojure/SpreadSheetDemo.clj diff --git a/src/examples/groovy/SpreadSheetDemo.groovy b/examples/src/main/groovy/SpreadSheetDemo.groovy similarity index 100% rename from src/examples/groovy/SpreadSheetDemo.groovy rename to examples/src/main/groovy/SpreadSheetDemo.groovy diff --git a/src/examples/groovy/build.gradle b/examples/src/main/groovy/build.gradle similarity index 100% rename from src/examples/groovy/build.gradle rename to examples/src/main/groovy/build.gradle diff --git a/src/examples/src/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java b/examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java rename to examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java diff --git a/src/examples/src/org/apache/poi/examples/hpsf/CopyCompare.java b/examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hpsf/CopyCompare.java rename to examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java diff --git a/src/examples/src/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java b/examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java rename to examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java diff --git a/src/examples/src/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java b/examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java rename to examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java diff --git a/src/examples/src/org/apache/poi/examples/hpsf/ReadTitle.java b/examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hpsf/ReadTitle.java rename to examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java diff --git a/src/examples/src/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java b/examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java rename to examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java diff --git a/src/examples/src/org/apache/poi/examples/hpsf/WriteTitle.java b/examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hpsf/WriteTitle.java rename to examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/ApacheconEU08.java b/examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/ApacheconEU08.java rename to examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/BulletsDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/BulletsDemo.java rename to examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/CreateHyperlink.java b/examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/CreateHyperlink.java rename to examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/DataExtraction.java b/examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/DataExtraction.java rename to examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/Graphics2DDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/Graphics2DDemo.java rename to examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/HeadersFootersDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/HeadersFootersDemo.java rename to examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/Hyperlinks.java b/examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/Hyperlinks.java rename to examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/SoundFinder.java b/examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/SoundFinder.java rename to examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java diff --git a/src/examples/src/org/apache/poi/examples/hslf/TableDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hslf/TableDemo.java rename to examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java diff --git a/src/examples/src/org/apache/poi/examples/hsmf/Msg2txt.java b/examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hsmf/Msg2txt.java rename to examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java b/examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java rename to examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Alignment.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/Alignment.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/BigExample.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/BigExample.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Borders.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/Borders.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CellComments.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/CellComments.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CellTypes.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/CellTypes.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateCells.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/EventExample.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EventExample.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/EventExample.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EventExample.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/InCellLists.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/InCellLists.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/InCellLists.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/InCellLists.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/MergedCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/MergedCells.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewSheet.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/NewSheet.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Outlines.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Outlines.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java rename to examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java diff --git a/src/examples/src/org/apache/poi/examples/hwmf/ROP2Table.java b/examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hwmf/ROP2Table.java rename to examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java diff --git a/src/examples/src/org/apache/poi/examples/hwmf/ROP3Table.java b/examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hwmf/ROP3Table.java rename to examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java diff --git a/src/examples/src/org/apache/poi/examples/hwpf/Word2Forrest.java b/examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/hwpf/Word2Forrest.java rename to examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java diff --git a/src/examples/src/org/apache/poi/examples/ss/AddDimensionedImage.java b/examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/AddDimensionedImage.java rename to examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java diff --git a/src/examples/src/org/apache/poi/examples/ss/AligningCells.java b/examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/AligningCells.java rename to examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java diff --git a/src/examples/src/org/apache/poi/examples/ss/BusinessPlan.java b/examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/BusinessPlan.java rename to examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java diff --git a/src/examples/src/org/apache/poi/examples/ss/CalendarDemo.java b/examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/CalendarDemo.java rename to examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java diff --git a/src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java b/examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java rename to examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java diff --git a/src/examples/src/org/apache/poi/examples/ss/ConditionalFormats.java b/examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/ConditionalFormats.java rename to examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java diff --git a/src/examples/src/org/apache/poi/examples/ss/DrawingBorders.java b/examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/DrawingBorders.java rename to examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java diff --git a/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java b/examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java rename to examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java diff --git a/src/examples/src/org/apache/poi/examples/ss/LinkedDropDownLists.java b/examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/LinkedDropDownLists.java rename to examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java diff --git a/src/examples/src/org/apache/poi/examples/ss/LoadEmbedded.java b/examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/LoadEmbedded.java rename to examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java diff --git a/src/examples/src/org/apache/poi/examples/ss/LoanCalculator.java b/examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/LoanCalculator.java rename to examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java diff --git a/src/examples/src/org/apache/poi/examples/ss/SSPerformanceTest.java b/examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/SSPerformanceTest.java rename to examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java diff --git a/src/examples/src/org/apache/poi/examples/ss/TimesheetDemo.java b/examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/TimesheetDemo.java rename to examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java diff --git a/src/examples/src/org/apache/poi/examples/ss/ToCSV.java b/examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/ToCSV.java rename to examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/CalculateMortgage.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/formula/CalculateMortgage.java rename to examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java rename to examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/SettingExternalFunction.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/formula/SettingExternalFunction.java rename to examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java rename to examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/mortgage-calculation.xls b/examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/formula/mortgage-calculation.xls rename to examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls diff --git a/src/examples/src/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java b/examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java rename to examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java diff --git a/src/examples/src/org/apache/poi/examples/ss/html/HtmlHelper.java b/examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/html/HtmlHelper.java rename to examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java diff --git a/src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java b/examples/src/main/java/org/apache/poi/examples/ss/html/ToHtml.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java rename to examples/src/main/java/org/apache/poi/examples/ss/html/ToHtml.java diff --git a/src/examples/src/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java b/examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java rename to examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java diff --git a/src/examples/src/org/apache/poi/examples/ss/html/excelStyle.css b/examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/html/excelStyle.css rename to examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css diff --git a/src/examples/src/org/apache/poi/examples/ss/html/package-info.java b/examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/ss/html/package-info.java rename to examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java diff --git a/src/examples/src/org/apache/poi/examples/util/TempFileUtils.java b/examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/util/TempFileUtils.java rename to examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt b/examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt rename to examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt diff --git a/src/examples/src/org/apache/poi/examples/xslf/BarChartDemo.java b/examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/BarChartDemo.java rename to examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/ChartFromScratch.java b/examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/ChartFromScratch.java rename to examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/DataExtraction.java b/examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/DataExtraction.java rename to examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java b/examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java rename to examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java b/examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java rename to examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/MergePresentations.java b/examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/MergePresentations.java rename to examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/PieChartDemo.java b/examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/PieChartDemo.java rename to examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial1.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/Tutorial1.java rename to examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial2.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/Tutorial2.java rename to examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial3.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/Tutorial3.java rename to examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial4.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/Tutorial4.java rename to examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial5.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/Tutorial5.java rename to examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial6.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/Tutorial6.java rename to examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial7.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/Tutorial7.java rename to examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/bar-chart-data.txt b/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-data.txt similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/bar-chart-data.txt rename to examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-data.txt diff --git a/src/examples/src/org/apache/poi/examples/xslf/bar-chart-template.pptx b/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/bar-chart-template.pptx rename to examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx diff --git a/src/examples/src/org/apache/poi/examples/xslf/pie-chart-data.txt b/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-data.txt similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/pie-chart-data.txt rename to examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-data.txt diff --git a/src/examples/src/org/apache/poi/examples/xslf/pie-chart-template.pptx b/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/pie-chart-template.pptx rename to examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx diff --git a/src/examples/src/org/apache/poi/examples/xslf/tutorial/Step1.java b/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/tutorial/Step1.java rename to examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java diff --git a/src/examples/src/org/apache/poi/examples/xslf/tutorial/Step2.java b/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xslf/tutorial/Step2.java rename to examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java rename to examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java rename to examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java rename to examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java rename to examples/src/main/java/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/HybridStreaming.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/streaming/HybridStreaming.java rename to examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/Outlining.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/Outlining.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/streaming/Outlining.java rename to examples/src/main/java/org/apache/poi/examples/xssf/streaming/Outlining.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java rename to examples/src/main/java/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/AligningCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/AligningCells.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BarChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarChart.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/BarChart.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarChart.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CellComments.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CellComments.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateCell.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateCell.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateTable.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateTable.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/IterateCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/IterateCells.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/LineChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LineChart.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/LineChart.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LineChart.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/MergingCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/MergingCells.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/Outlining.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/Outlining.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ScatterChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ScatterChart.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/ScatterChart.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ScatterChart.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ShiftRows.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/ShiftRows.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java rename to examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx similarity index 100% rename from src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx rename to examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx diff --git a/src/multimodule/examples/java9/module-info.class b/examples/src/main/java9/module-info.class similarity index 100% rename from src/multimodule/examples/java9/module-info.class rename to examples/src/main/java9/module-info.class diff --git a/src/multimodule/examples/java9/module-info.java b/examples/src/main/java9/module-info.java similarity index 100% rename from src/multimodule/examples/java9/module-info.java rename to examples/src/main/java9/module-info.java diff --git a/src/examples/jsp/HSSFExample.jsp b/examples/src/main/jsp/HSSFExample.jsp similarity index 100% rename from src/examples/jsp/HSSFExample.jsp rename to examples/src/main/jsp/HSSFExample.jsp diff --git a/src/contrib/poi-ruby/Makefile b/examples/src/main/ruby/Makefile similarity index 100% rename from src/contrib/poi-ruby/Makefile rename to examples/src/main/ruby/Makefile diff --git a/src/contrib/poi-ruby/Poi4R.i b/examples/src/main/ruby/Poi4R.i similarity index 100% rename from src/contrib/poi-ruby/Poi4R.i rename to examples/src/main/ruby/Poi4R.i diff --git a/src/contrib/poi-ruby/cpp/RubyIO.cpp b/examples/src/main/ruby/cpp/RubyIO.cpp similarity index 100% rename from src/contrib/poi-ruby/cpp/RubyIO.cpp rename to examples/src/main/ruby/cpp/RubyIO.cpp diff --git a/src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java b/examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java similarity index 100% rename from src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java rename to examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java diff --git a/src/contrib/poi-ruby/tests/tc_base_tests.rb b/examples/src/main/ruby/tests/tc_base_tests.rb similarity index 100% rename from src/contrib/poi-ruby/tests/tc_base_tests.rb rename to examples/src/main/ruby/tests/tc_base_tests.rb diff --git a/src/contrib/poi-ruby/tests/tc_gc.rb b/examples/src/main/ruby/tests/tc_gc.rb similarity index 100% rename from src/contrib/poi-ruby/tests/tc_gc.rb rename to examples/src/main/ruby/tests/tc_gc.rb diff --git a/src/contrib/poi-ruby/tests/ts_all.rb b/examples/src/main/ruby/tests/ts_all.rb similarity index 100% rename from src/contrib/poi-ruby/tests/ts_all.rb rename to examples/src/main/ruby/tests/ts_all.rb diff --git a/src/examples/scala/XSSFMain.scala b/examples/src/main/scala/XSSFMain.scala similarity index 100% rename from src/examples/scala/XSSFMain.scala rename to examples/src/main/scala/XSSFMain.scala diff --git a/src/examples/scala/build.sbt b/examples/src/main/scala/build.sbt similarity index 100% rename from src/examples/scala/build.sbt rename to examples/src/main/scala/build.sbt diff --git a/src/records/definitions/plot_area_record.xml b/excelant/build.gradle similarity index 60% rename from src/records/definitions/plot_area_record.xml rename to excelant/build.gradle index 300492a4cc..fb65866061 100644 --- a/src/records/definitions/plot_area_record.xml +++ b/excelant/build.gradle @@ -1,6 +1,4 @@ - - - - Record - Record - preceeds and identifies a frame as belonging to the plot area. - Andrew C. Oliver (acoliver at apache.org) - 4 - +==================================================================== */ + +dependencies { + api 'org.apache.ant:ant:1.10.9' + + api project(':ooxml') + + testImplementation project(path: ':main', configuration: 'tests') +} + +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.apache.poi.excelant' + } +} + +japicmp.baseline = "org.apache.poi:poi-excelant:${japicmpversion}@jar" \ No newline at end of file diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSet.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSet.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java b/excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java similarity index 100% rename from src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java rename to excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java diff --git a/src/multimodule/excelant/java9/module-info.class b/excelant/src/main/java9/module-info.class similarity index 100% rename from src/multimodule/excelant/java9/module-info.class rename to excelant/src/main/java9/module-info.class diff --git a/src/multimodule/excelant/java9/module-info.java b/excelant/src/main/java9/module-info.java similarity index 100% rename from src/multimodule/excelant/java9/module-info.java rename to excelant/src/main/java9/module-info.java diff --git a/src/excelant/resources/org/apache/poi/ss/excelant/antlib.xml b/excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml similarity index 100% rename from src/excelant/resources/org/apache/poi/ss/excelant/antlib.xml rename to excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml diff --git a/src/excelant/poi-ant-contrib/Bytes2Mega.java b/excelant/src/poi-ant-contrib/java/Bytes2Mega.java similarity index 100% rename from src/excelant/poi-ant-contrib/Bytes2Mega.java rename to excelant/src/poi-ant-contrib/java/Bytes2Mega.java diff --git a/src/excelant/poi-ant-contrib/Junit5Progress.java b/excelant/src/poi-ant-contrib/java/Junit5Progress.java similarity index 100% rename from src/excelant/poi-ant-contrib/Junit5Progress.java rename to excelant/src/poi-ant-contrib/java/Junit5Progress.java diff --git a/src/excelant/poi-ant-contrib/NextRelease.java b/excelant/src/poi-ant-contrib/java/NextRelease.java similarity index 100% rename from src/excelant/poi-ant-contrib/NextRelease.java rename to excelant/src/poi-ant-contrib/java/NextRelease.java diff --git a/src/excelant/poi-ant-contrib/PropertyReset.java b/excelant/src/poi-ant-contrib/java/PropertyReset.java similarity index 100% rename from src/excelant/poi-ant-contrib/PropertyReset.java rename to excelant/src/poi-ant-contrib/java/PropertyReset.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/CalculateMortgageFunction.java b/excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/CalculateMortgageFunction.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java b/excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java b/excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java similarity index 99% rename from src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java index 89e948aaa4..dbf096ca26 100644 --- a/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java +++ b/excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java @@ -51,7 +51,7 @@ public class TestBuildFile { @BeforeEach void setUp() { - String filename = TestBuildFile.getDataDir() + "/../src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml"; + String filename = TestBuildFile.getDataDir() + "/../excelant/src/test/resources/tests.xml"; int logLevel = Project.MSG_DEBUG; logBuffer = new StringBuilder(); diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java rename to excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java diff --git a/src/multimodule/excelant/test9/module-info.class b/excelant/src/test/java9/module-info.class similarity index 100% rename from src/multimodule/excelant/test9/module-info.class rename to excelant/src/test/java9/module-info.class diff --git a/src/multimodule/excelant/test9/module-info.java b/excelant/src/test/java9/module-info.java similarity index 100% rename from src/multimodule/excelant/test9/module-info.java rename to excelant/src/test/java9/module-info.java diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml b/excelant/src/test/resources/tests.xml similarity index 100% rename from src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml rename to excelant/src/test/resources/tests.xml diff --git a/src/records/definitions/units_record.xml b/integrationtest/build.gradle similarity index 55% rename from src/records/definitions/units_record.xml rename to integrationtest/build.gradle index ff281265a3..0121e71626 100644 --- a/src/records/definitions/units_record.xml +++ b/integrationtest/build.gradle @@ -1,6 +1,4 @@ - - - - Record - Record - The units record describes units. - Glen Stampoultzis (glens at apache.org) - - - - +==================================================================== */ + +dependencies { + testImplementation 'org.apache.ant:ant:1.10.9' + + testImplementation project(':ooxml') + testImplementation project(':scratchpad') + testImplementation project(':examples') + + testImplementation files(this.project(':ooxml').sourceSets.test.runtimeClasspath) +} + +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.apache.poi.integrationtest' + } +} + +test { + // exclude these from the normal test-run + exclude '**/*FileHandler.class' +} + +japicmp.enabled = false \ No newline at end of file diff --git a/src/integrationtest/build.xml b/integrationtest/src/test/java/build.xml similarity index 100% rename from src/integrationtest/build.xml rename to integrationtest/src/test/java/build.xml diff --git a/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/AbstractFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/AbstractFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java b/integrationtest/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java rename to integrationtest/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java diff --git a/src/integrationtest/org/apache/poi/stress/ExcInfo.java b/integrationtest/src/test/java/org/apache/poi/stress/ExcInfo.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/ExcInfo.java rename to integrationtest/src/test/java/org/apache/poi/stress/ExcInfo.java diff --git a/src/integrationtest/org/apache/poi/stress/FileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/FileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/FileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/FileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/FileHandlerFactory.java b/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerFactory.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/FileHandlerFactory.java rename to integrationtest/src/test/java/org/apache/poi/stress/FileHandlerFactory.java diff --git a/src/integrationtest/org/apache/poi/stress/FileHandlerKnown.java b/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerKnown.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/FileHandlerKnown.java rename to integrationtest/src/test/java/org/apache/poi/stress/FileHandlerKnown.java diff --git a/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HDGFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HDGFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HMEFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HMEFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HPBFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HPBFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HPSFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HPSFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HSLFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HSLFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HSMFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HSMFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HSSFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HSSFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HWPFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/HWPFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/HeapDump.java b/integrationtest/src/test/java/org/apache/poi/stress/HeapDump.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/HeapDump.java rename to integrationtest/src/test/java/org/apache/poi/stress/HeapDump.java diff --git a/src/integrationtest/org/apache/poi/stress/OPCFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/OPCFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/OPCFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/OPCFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/OWPFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/OWPFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/OWPFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/OWPFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/POIFSFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/POIFSFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/POIXMLDocumentHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/POIXMLDocumentHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/SlideShowHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/SlideShowHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/SlideShowHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/StressMap.java b/integrationtest/src/test/java/org/apache/poi/stress/StressMap.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/StressMap.java rename to integrationtest/src/test/java/org/apache/poi/stress/StressMap.java diff --git a/src/integrationtest/org/apache/poi/stress/TestAllFiles.java b/integrationtest/src/test/java/org/apache/poi/stress/TestAllFiles.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/TestAllFiles.java rename to integrationtest/src/test/java/org/apache/poi/stress/TestAllFiles.java diff --git a/src/integrationtest/org/apache/poi/stress/XDGFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XDGFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/XDGFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/XDGFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XSLFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/XSLFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/XSSFBFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/XSSFBFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XSSFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/XSSFFileHandler.java diff --git a/src/integrationtest/org/apache/poi/stress/XWPFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XWPFFileHandler.java similarity index 100% rename from src/integrationtest/org/apache/poi/stress/XWPFFileHandler.java rename to integrationtest/src/test/java/org/apache/poi/stress/XWPFFileHandler.java diff --git a/src/multimodule/integration/java9/module-info.java b/integrationtest/src/test/java9/module-info.java similarity index 100% rename from src/multimodule/integration/java9/module-info.java rename to integrationtest/src/test/java9/module-info.java diff --git a/src/resources/integrationtest/log4j2-test.xml b/integrationtest/src/test/resources/log4j2-test.xml similarity index 100% rename from src/resources/integrationtest/log4j2-test.xml rename to integrationtest/src/test/resources/log4j2-test.xml diff --git a/main/build.gradle b/main/build.gradle new file mode 100644 index 0000000000..5167b32cfe --- /dev/null +++ b/main/build.gradle @@ -0,0 +1,50 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + +dependencies { + implementation "commons-codec:commons-codec:${commonsCodecVersion}" + implementation 'org.apache.commons:commons-collections4:4.4' + implementation "org.apache.commons:commons-math3:${commonsMathVersion}" + implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" + implementation 'javax.activation:activation:1.1.1' + api 'com.zaxxer:SparseBitSet:1.2' + + testImplementation 'org.reflections:reflections:0.9.12' +} + +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.apache.poi.main' + } +} + +// Create a separate jar for test-code to depend on it in other projects +// See http://stackoverflow.com/questions/5144325/gradle-test-dependency +task testJar(type: Jar, dependsOn: testClasses) { + baseName = "test-${project.archivesBaseName}" + from sourceSets.test.output +} + +configurations { + tests +} + +artifacts { + tests testJar +} + +japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" \ No newline at end of file diff --git a/src/models/BlockClassDiagram.pgml b/main/models/BlockClassDiagram.pgml similarity index 100% rename from src/models/BlockClassDiagram.pgml rename to main/models/BlockClassDiagram.pgml diff --git a/src/models/HSSFOperationalUseCases.pgml b/main/models/HSSFOperationalUseCases.pgml similarity index 100% rename from src/models/HSSFOperationalUseCases.pgml rename to main/models/HSSFOperationalUseCases.pgml diff --git a/src/models/HSSFSerializerClassDiagram.pgml b/main/models/HSSFSerializerClassDiagram.pgml similarity index 100% rename from src/models/HSSFSerializerClassDiagram.pgml rename to main/models/HSSFSerializerClassDiagram.pgml diff --git a/src/models/HSSFSerializerUseCases.pgml b/main/models/HSSFSerializerUseCases.pgml similarity index 100% rename from src/models/HSSFSerializerUseCases.pgml rename to main/models/HSSFSerializerUseCases.pgml diff --git a/src/models/HSSFUseCases.pgml b/main/models/HSSFUseCases.pgml similarity index 100% rename from src/models/HSSFUseCases.pgml rename to main/models/HSSFUseCases.pgml diff --git a/src/models/POIFSAddDocument.pgml b/main/models/POIFSAddDocument.pgml similarity index 100% rename from src/models/POIFSAddDocument.pgml rename to main/models/POIFSAddDocument.pgml diff --git a/src/models/POIFSClassDiagram.pgml b/main/models/POIFSClassDiagram.pgml similarity index 100% rename from src/models/POIFSClassDiagram.pgml rename to main/models/POIFSClassDiagram.pgml diff --git a/src/models/POIFSInitialization.pgml b/main/models/POIFSInitialization.pgml similarity index 100% rename from src/models/POIFSInitialization.pgml rename to main/models/POIFSInitialization.pgml diff --git a/src/models/POIFSLifeCycle.pgml b/main/models/POIFSLifeCycle.pgml similarity index 100% rename from src/models/POIFSLifeCycle.pgml rename to main/models/POIFSLifeCycle.pgml diff --git a/src/models/POIFSPropertyTablePreWrite.pgml b/main/models/POIFSPropertyTablePreWrite.pgml similarity index 100% rename from src/models/POIFSPropertyTablePreWrite.pgml rename to main/models/POIFSPropertyTablePreWrite.pgml diff --git a/src/models/POIFSRootPropertyPreWrite.pgml b/main/models/POIFSRootPropertyPreWrite.pgml similarity index 100% rename from src/models/POIFSRootPropertyPreWrite.pgml rename to main/models/POIFSRootPropertyPreWrite.pgml diff --git a/src/models/POIFSWriteFilesystem.pgml b/main/models/POIFSWriteFilesystem.pgml similarity index 100% rename from src/models/POIFSWriteFilesystem.pgml rename to main/models/POIFSWriteFilesystem.pgml diff --git a/src/models/POIUseCases.pgml b/main/models/POIUseCases.pgml similarity index 100% rename from src/models/POIUseCases.pgml rename to main/models/POIUseCases.pgml diff --git a/src/models/PropertyTableClassDiagram.pgml b/main/models/PropertyTableClassDiagram.pgml similarity index 100% rename from src/models/PropertyTableClassDiagram.pgml rename to main/models/PropertyTableClassDiagram.pgml diff --git a/src/models/analysismain.pgml b/main/models/analysismain.pgml similarity index 100% rename from src/models/analysismain.pgml rename to main/models/analysismain.pgml diff --git a/src/models/poi.argo b/main/models/poi.argo similarity index 100% rename from src/models/poi.argo rename to main/models/poi.argo diff --git a/src/models/poi.xmi b/main/models/poi.xmi similarity index 100% rename from src/models/poi.xmi rename to main/models/poi.xmi diff --git a/src/models/poifsAnalysisClasses.pgml b/main/models/poifsAnalysisClasses.pgml similarity index 100% rename from src/models/poifsAnalysisClasses.pgml rename to main/models/poifsAnalysisClasses.pgml diff --git a/src/models/projectmain.pgml b/main/models/projectmain.pgml similarity index 100% rename from src/models/projectmain.pgml rename to main/models/projectmain.pgml diff --git a/src/models/readFileFromFilesystemSequenceDiagram.pgml b/main/models/readFileFromFilesystemSequenceDiagram.pgml similarity index 100% rename from src/models/readFileFromFilesystemSequenceDiagram.pgml rename to main/models/readFileFromFilesystemSequenceDiagram.pgml diff --git a/src/models/readFileSystemDirectorySequenceDiagram.pgml b/main/models/readFileSystemDirectorySequenceDiagram.pgml similarity index 100% rename from src/models/readFileSystemDirectorySequenceDiagram.pgml rename to main/models/readFileSystemDirectorySequenceDiagram.pgml diff --git a/src/models/readFilesystemSequenceDiagram.pgml b/main/models/readFilesystemSequenceDiagram.pgml similarity index 100% rename from src/models/readFilesystemSequenceDiagram.pgml rename to main/models/readFilesystemSequenceDiagram.pgml diff --git a/src/models/utilClasses.pgml b/main/models/utilClasses.pgml similarity index 100% rename from src/models/utilClasses.pgml rename to main/models/utilClasses.pgml diff --git a/src/models/writeFilesystemSequenceDiagram.pgml b/main/models/writeFilesystemSequenceDiagram.pgml similarity index 100% rename from src/models/writeFilesystemSequenceDiagram.pgml rename to main/models/writeFilesystemSequenceDiagram.pgml diff --git a/src/java/org/apache/poi/EmptyFileException.java b/main/src/main/java/org/apache/poi/EmptyFileException.java similarity index 100% rename from src/java/org/apache/poi/EmptyFileException.java rename to main/src/main/java/org/apache/poi/EmptyFileException.java diff --git a/src/java/org/apache/poi/EncryptedDocumentException.java b/main/src/main/java/org/apache/poi/EncryptedDocumentException.java similarity index 100% rename from src/java/org/apache/poi/EncryptedDocumentException.java rename to main/src/main/java/org/apache/poi/EncryptedDocumentException.java diff --git a/src/java/org/apache/poi/OldFileFormatException.java b/main/src/main/java/org/apache/poi/OldFileFormatException.java similarity index 100% rename from src/java/org/apache/poi/OldFileFormatException.java rename to main/src/main/java/org/apache/poi/OldFileFormatException.java diff --git a/src/java/org/apache/poi/POIDocument.java b/main/src/main/java/org/apache/poi/POIDocument.java similarity index 100% rename from src/java/org/apache/poi/POIDocument.java rename to main/src/main/java/org/apache/poi/POIDocument.java diff --git a/src/java/org/apache/poi/POIReadOnlyDocument.java b/main/src/main/java/org/apache/poi/POIReadOnlyDocument.java similarity index 100% rename from src/java/org/apache/poi/POIReadOnlyDocument.java rename to main/src/main/java/org/apache/poi/POIReadOnlyDocument.java diff --git a/src/java/org/apache/poi/UnsupportedFileFormatException.java b/main/src/main/java/org/apache/poi/UnsupportedFileFormatException.java similarity index 100% rename from src/java/org/apache/poi/UnsupportedFileFormatException.java rename to main/src/main/java/org/apache/poi/UnsupportedFileFormatException.java diff --git a/src/java/org/apache/poi/common/Duplicatable.java b/main/src/main/java/org/apache/poi/common/Duplicatable.java similarity index 100% rename from src/java/org/apache/poi/common/Duplicatable.java rename to main/src/main/java/org/apache/poi/common/Duplicatable.java diff --git a/src/java/org/apache/poi/common/usermodel/GenericRecord.java b/main/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/GenericRecord.java rename to main/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java diff --git a/src/java/org/apache/poi/common/usermodel/Hyperlink.java b/main/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/Hyperlink.java rename to main/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java diff --git a/src/java/org/apache/poi/common/usermodel/HyperlinkType.java b/main/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/HyperlinkType.java rename to main/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java diff --git a/src/java/org/apache/poi/common/usermodel/PictureType.java b/main/src/main/java/org/apache/poi/common/usermodel/PictureType.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/PictureType.java rename to main/src/main/java/org/apache/poi/common/usermodel/PictureType.java diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontCharset.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/fonts/FontCharset.java rename to main/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontFacet.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/fonts/FontFacet.java rename to main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontFamily.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/fonts/FontFamily.java rename to main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontGroup.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/fonts/FontGroup.java rename to main/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontHeader.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/fonts/FontHeader.java rename to main/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontInfo.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/fonts/FontInfo.java rename to main/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontPitch.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java similarity index 100% rename from src/java/org/apache/poi/common/usermodel/fonts/FontPitch.java rename to main/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java diff --git a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java b/main/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java rename to main/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java diff --git a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java b/main/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java similarity index 100% rename from src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java rename to main/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java diff --git a/src/java/org/apache/poi/ddf/EscherArrayProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherArrayProperty.java rename to main/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java diff --git a/src/java/org/apache/poi/ddf/EscherBSERecord.java b/main/src/main/java/org/apache/poi/ddf/EscherBSERecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherBSERecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherBSERecord.java diff --git a/src/java/org/apache/poi/ddf/EscherBitmapBlip.java b/main/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherBitmapBlip.java rename to main/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java diff --git a/src/java/org/apache/poi/ddf/EscherBlipRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherBlipRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherBoolProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherBoolProperty.java rename to main/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java diff --git a/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherClientDataRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherClientDataRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherColorRef.java b/main/src/main/java/org/apache/poi/ddf/EscherColorRef.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherColorRef.java rename to main/src/main/java/org/apache/poi/ddf/EscherColorRef.java diff --git a/src/java/org/apache/poi/ddf/EscherComplexProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherComplexProperty.java rename to main/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java diff --git a/src/java/org/apache/poi/ddf/EscherContainerRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherContainerRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherDgRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherDgRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherDgRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherDgRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherDggRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherDggRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherDggRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherDggRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherDump.java b/main/src/main/java/org/apache/poi/ddf/EscherDump.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherDump.java rename to main/src/main/java/org/apache/poi/ddf/EscherDump.java diff --git a/src/java/org/apache/poi/ddf/EscherMetafileBlip.java b/main/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherMetafileBlip.java rename to main/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java diff --git a/src/java/org/apache/poi/ddf/EscherOptRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherOptRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherOptRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherOptRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherProperty.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherProperty.java rename to main/src/main/java/org/apache/poi/ddf/EscherProperty.java diff --git a/src/java/org/apache/poi/ddf/EscherPropertyFactory.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherPropertyFactory.java rename to main/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java diff --git a/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherPropertyMetaData.java rename to main/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java diff --git a/src/java/org/apache/poi/ddf/EscherPropertyTypes.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherPropertyTypes.java rename to main/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java diff --git a/src/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java rename to main/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java diff --git a/src/java/org/apache/poi/ddf/EscherRGBProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherRGBProperty.java rename to main/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java diff --git a/src/java/org/apache/poi/ddf/EscherRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherRecordFactory.java b/main/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherRecordFactory.java rename to main/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java diff --git a/src/java/org/apache/poi/ddf/EscherRecordTypes.java b/main/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherRecordTypes.java rename to main/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java diff --git a/src/java/org/apache/poi/ddf/EscherSerializationListener.java b/main/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherSerializationListener.java rename to main/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java diff --git a/src/java/org/apache/poi/ddf/EscherShapePathProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherShapePathProperty.java rename to main/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java diff --git a/src/java/org/apache/poi/ddf/EscherSimpleProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherSimpleProperty.java rename to main/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java diff --git a/src/java/org/apache/poi/ddf/EscherSpRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherSpRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherSpRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherSpRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherSpgrRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherSpgrRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java diff --git a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/EscherTextboxRecord.java rename to main/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java diff --git a/src/java/org/apache/poi/ddf/NullEscherSerializationListener.java b/main/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java similarity index 100% rename from src/java/org/apache/poi/ddf/NullEscherSerializationListener.java rename to main/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java diff --git a/src/java/org/apache/poi/ddf/UnknownEscherRecord.java b/main/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java similarity index 100% rename from src/java/org/apache/poi/ddf/UnknownEscherRecord.java rename to main/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java diff --git a/src/java/org/apache/poi/ddf/package-info.java b/main/src/main/java/org/apache/poi/ddf/package-info.java similarity index 100% rename from src/java/org/apache/poi/ddf/package-info.java rename to main/src/main/java/org/apache/poi/ddf/package-info.java diff --git a/src/java/org/apache/poi/extractor/ExtractorFactory.java b/main/src/main/java/org/apache/poi/extractor/ExtractorFactory.java similarity index 100% rename from src/java/org/apache/poi/extractor/ExtractorFactory.java rename to main/src/main/java/org/apache/poi/extractor/ExtractorFactory.java diff --git a/src/java/org/apache/poi/extractor/ExtractorProvider.java b/main/src/main/java/org/apache/poi/extractor/ExtractorProvider.java similarity index 100% rename from src/java/org/apache/poi/extractor/ExtractorProvider.java rename to main/src/main/java/org/apache/poi/extractor/ExtractorProvider.java diff --git a/src/java/org/apache/poi/extractor/MainExtractorFactory.java b/main/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java similarity index 100% rename from src/java/org/apache/poi/extractor/MainExtractorFactory.java rename to main/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java diff --git a/src/java/org/apache/poi/extractor/POIOLE2TextExtractor.java b/main/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java similarity index 100% rename from src/java/org/apache/poi/extractor/POIOLE2TextExtractor.java rename to main/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java diff --git a/src/java/org/apache/poi/extractor/POITextExtractor.java b/main/src/main/java/org/apache/poi/extractor/POITextExtractor.java similarity index 100% rename from src/java/org/apache/poi/extractor/POITextExtractor.java rename to main/src/main/java/org/apache/poi/extractor/POITextExtractor.java diff --git a/src/java/org/apache/poi/hpsf/Array.java b/main/src/main/java/org/apache/poi/hpsf/Array.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Array.java rename to main/src/main/java/org/apache/poi/hpsf/Array.java diff --git a/src/java/org/apache/poi/hpsf/Blob.java b/main/src/main/java/org/apache/poi/hpsf/Blob.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Blob.java rename to main/src/main/java/org/apache/poi/hpsf/Blob.java diff --git a/src/java/org/apache/poi/hpsf/ClassID.java b/main/src/main/java/org/apache/poi/hpsf/ClassID.java similarity index 100% rename from src/java/org/apache/poi/hpsf/ClassID.java rename to main/src/main/java/org/apache/poi/hpsf/ClassID.java diff --git a/src/java/org/apache/poi/hpsf/ClassIDPredefined.java b/main/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java similarity index 100% rename from src/java/org/apache/poi/hpsf/ClassIDPredefined.java rename to main/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java diff --git a/src/java/org/apache/poi/hpsf/ClipboardData.java b/main/src/main/java/org/apache/poi/hpsf/ClipboardData.java similarity index 100% rename from src/java/org/apache/poi/hpsf/ClipboardData.java rename to main/src/main/java/org/apache/poi/hpsf/ClipboardData.java diff --git a/src/java/org/apache/poi/hpsf/CodePageString.java b/main/src/main/java/org/apache/poi/hpsf/CodePageString.java similarity index 100% rename from src/java/org/apache/poi/hpsf/CodePageString.java rename to main/src/main/java/org/apache/poi/hpsf/CodePageString.java diff --git a/src/java/org/apache/poi/hpsf/Currency.java b/main/src/main/java/org/apache/poi/hpsf/Currency.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Currency.java rename to main/src/main/java/org/apache/poi/hpsf/Currency.java diff --git a/src/java/org/apache/poi/hpsf/CustomProperties.java b/main/src/main/java/org/apache/poi/hpsf/CustomProperties.java similarity index 100% rename from src/java/org/apache/poi/hpsf/CustomProperties.java rename to main/src/main/java/org/apache/poi/hpsf/CustomProperties.java diff --git a/src/java/org/apache/poi/hpsf/CustomProperty.java b/main/src/main/java/org/apache/poi/hpsf/CustomProperty.java similarity index 100% rename from src/java/org/apache/poi/hpsf/CustomProperty.java rename to main/src/main/java/org/apache/poi/hpsf/CustomProperty.java diff --git a/src/java/org/apache/poi/hpsf/Date.java b/main/src/main/java/org/apache/poi/hpsf/Date.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Date.java rename to main/src/main/java/org/apache/poi/hpsf/Date.java diff --git a/src/java/org/apache/poi/hpsf/Decimal.java b/main/src/main/java/org/apache/poi/hpsf/Decimal.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Decimal.java rename to main/src/main/java/org/apache/poi/hpsf/Decimal.java diff --git a/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java b/main/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java similarity index 100% rename from src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java rename to main/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java diff --git a/src/java/org/apache/poi/hpsf/Filetime.java b/main/src/main/java/org/apache/poi/hpsf/Filetime.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Filetime.java rename to main/src/main/java/org/apache/poi/hpsf/Filetime.java diff --git a/src/java/org/apache/poi/hpsf/GUID.java b/main/src/main/java/org/apache/poi/hpsf/GUID.java similarity index 100% rename from src/java/org/apache/poi/hpsf/GUID.java rename to main/src/main/java/org/apache/poi/hpsf/GUID.java diff --git a/src/java/org/apache/poi/hpsf/HPSFException.java b/main/src/main/java/org/apache/poi/hpsf/HPSFException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/HPSFException.java rename to main/src/main/java/org/apache/poi/hpsf/HPSFException.java diff --git a/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java b/main/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java similarity index 100% rename from src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java rename to main/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java diff --git a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java b/main/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/HPSFRuntimeException.java rename to main/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java diff --git a/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java b/main/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java rename to main/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java diff --git a/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java b/main/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java rename to main/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java diff --git a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java b/main/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java similarity index 100% rename from src/java/org/apache/poi/hpsf/IndirectPropertyName.java rename to main/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java diff --git a/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java b/main/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/MarkUnsupportedException.java rename to main/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java diff --git a/src/java/org/apache/poi/hpsf/MissingSectionException.java b/main/src/main/java/org/apache/poi/hpsf/MissingSectionException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/MissingSectionException.java rename to main/src/main/java/org/apache/poi/hpsf/MissingSectionException.java diff --git a/src/java/org/apache/poi/hpsf/NoFormatIDException.java b/main/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/NoFormatIDException.java rename to main/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java diff --git a/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java b/main/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java rename to main/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java diff --git a/src/java/org/apache/poi/hpsf/NoSingleSectionException.java b/main/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/NoSingleSectionException.java rename to main/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java diff --git a/src/java/org/apache/poi/hpsf/Property.java b/main/src/main/java/org/apache/poi/hpsf/Property.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Property.java rename to main/src/main/java/org/apache/poi/hpsf/Property.java diff --git a/src/java/org/apache/poi/hpsf/PropertySet.java b/main/src/main/java/org/apache/poi/hpsf/PropertySet.java similarity index 100% rename from src/java/org/apache/poi/hpsf/PropertySet.java rename to main/src/main/java/org/apache/poi/hpsf/PropertySet.java diff --git a/src/java/org/apache/poi/hpsf/PropertySetFactory.java b/main/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java similarity index 100% rename from src/java/org/apache/poi/hpsf/PropertySetFactory.java rename to main/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java diff --git a/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java b/main/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java rename to main/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java diff --git a/src/java/org/apache/poi/hpsf/Section.java b/main/src/main/java/org/apache/poi/hpsf/Section.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Section.java rename to main/src/main/java/org/apache/poi/hpsf/Section.java diff --git a/src/java/org/apache/poi/hpsf/SummaryInformation.java b/main/src/main/java/org/apache/poi/hpsf/SummaryInformation.java similarity index 100% rename from src/java/org/apache/poi/hpsf/SummaryInformation.java rename to main/src/main/java/org/apache/poi/hpsf/SummaryInformation.java diff --git a/src/java/org/apache/poi/hpsf/Thumbnail.java b/main/src/main/java/org/apache/poi/hpsf/Thumbnail.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Thumbnail.java rename to main/src/main/java/org/apache/poi/hpsf/Thumbnail.java diff --git a/src/java/org/apache/poi/hpsf/TypedPropertyValue.java b/main/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java similarity index 100% rename from src/java/org/apache/poi/hpsf/TypedPropertyValue.java rename to main/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java diff --git a/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java b/main/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java rename to main/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java diff --git a/src/java/org/apache/poi/hpsf/UnicodeString.java b/main/src/main/java/org/apache/poi/hpsf/UnicodeString.java similarity index 100% rename from src/java/org/apache/poi/hpsf/UnicodeString.java rename to main/src/main/java/org/apache/poi/hpsf/UnicodeString.java diff --git a/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java b/main/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java rename to main/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java diff --git a/src/java/org/apache/poi/hpsf/Variant.java b/main/src/main/java/org/apache/poi/hpsf/Variant.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Variant.java rename to main/src/main/java/org/apache/poi/hpsf/Variant.java diff --git a/src/java/org/apache/poi/hpsf/VariantBool.java b/main/src/main/java/org/apache/poi/hpsf/VariantBool.java similarity index 100% rename from src/java/org/apache/poi/hpsf/VariantBool.java rename to main/src/main/java/org/apache/poi/hpsf/VariantBool.java diff --git a/src/java/org/apache/poi/hpsf/VariantSupport.java b/main/src/main/java/org/apache/poi/hpsf/VariantSupport.java similarity index 100% rename from src/java/org/apache/poi/hpsf/VariantSupport.java rename to main/src/main/java/org/apache/poi/hpsf/VariantSupport.java diff --git a/src/java/org/apache/poi/hpsf/VariantTypeException.java b/main/src/main/java/org/apache/poi/hpsf/VariantTypeException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/VariantTypeException.java rename to main/src/main/java/org/apache/poi/hpsf/VariantTypeException.java diff --git a/src/java/org/apache/poi/hpsf/Vector.java b/main/src/main/java/org/apache/poi/hpsf/Vector.java similarity index 100% rename from src/java/org/apache/poi/hpsf/Vector.java rename to main/src/main/java/org/apache/poi/hpsf/Vector.java diff --git a/src/java/org/apache/poi/hpsf/VersionedStream.java b/main/src/main/java/org/apache/poi/hpsf/VersionedStream.java similarity index 100% rename from src/java/org/apache/poi/hpsf/VersionedStream.java rename to main/src/main/java/org/apache/poi/hpsf/VersionedStream.java diff --git a/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java b/main/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java similarity index 100% rename from src/java/org/apache/poi/hpsf/WritingNotSupportedException.java rename to main/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java diff --git a/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java b/main/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java similarity index 100% rename from src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java rename to main/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java diff --git a/src/java/org/apache/poi/hpsf/package-info.java b/main/src/main/java/org/apache/poi/hpsf/package-info.java similarity index 100% rename from src/java/org/apache/poi/hpsf/package-info.java rename to main/src/main/java/org/apache/poi/hpsf/package-info.java diff --git a/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java b/main/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java similarity index 100% rename from src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java rename to main/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java diff --git a/src/java/org/apache/poi/hpsf/wellknown/package-info.java b/main/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java similarity index 100% rename from src/java/org/apache/poi/hpsf/wellknown/package-info.java rename to main/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java diff --git a/src/java/org/apache/poi/hssf/OldExcelFormatException.java b/main/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java similarity index 100% rename from src/java/org/apache/poi/hssf/OldExcelFormatException.java rename to main/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java diff --git a/src/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java b/main/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java similarity index 100% rename from src/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java rename to main/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/main/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java similarity index 100% rename from src/java/org/apache/poi/hssf/dev/BiffViewer.java rename to main/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java diff --git a/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java b/main/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java similarity index 100% rename from src/java/org/apache/poi/hssf/dev/EFBiffViewer.java rename to main/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java diff --git a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java b/main/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java similarity index 100% rename from src/java/org/apache/poi/hssf/dev/FormulaViewer.java rename to main/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java diff --git a/src/java/org/apache/poi/hssf/dev/ReSave.java b/main/src/main/java/org/apache/poi/hssf/dev/ReSave.java similarity index 100% rename from src/java/org/apache/poi/hssf/dev/ReSave.java rename to main/src/main/java/org/apache/poi/hssf/dev/ReSave.java diff --git a/src/java/org/apache/poi/hssf/dev/RecordLister.java b/main/src/main/java/org/apache/poi/hssf/dev/RecordLister.java similarity index 100% rename from src/java/org/apache/poi/hssf/dev/RecordLister.java rename to main/src/main/java/org/apache/poi/hssf/dev/RecordLister.java diff --git a/src/java/org/apache/poi/hssf/dev/package-info.java b/main/src/main/java/org/apache/poi/hssf/dev/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/dev/package-info.java rename to main/src/main/java/org/apache/poi/hssf/dev/package-info.java diff --git a/src/java/org/apache/poi/hssf/eventmodel/ERFListener.java b/main/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventmodel/ERFListener.java rename to main/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java diff --git a/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java b/main/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java rename to main/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java diff --git a/src/java/org/apache/poi/hssf/eventusermodel/package-info.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/eventusermodel/package-info.java rename to main/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java diff --git a/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java b/main/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java similarity index 100% rename from src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java rename to main/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java diff --git a/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java b/main/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java similarity index 100% rename from src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java rename to main/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java diff --git a/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java b/main/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java similarity index 100% rename from src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java rename to main/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java diff --git a/src/java/org/apache/poi/hssf/model/ConvertAnchor.java b/main/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/ConvertAnchor.java rename to main/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java diff --git a/src/java/org/apache/poi/hssf/model/DrawingManager2.java b/main/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/DrawingManager2.java rename to main/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java diff --git a/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java b/main/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java rename to main/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java diff --git a/src/java/org/apache/poi/hssf/model/InternalSheet.java b/main/src/main/java/org/apache/poi/hssf/model/InternalSheet.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/InternalSheet.java rename to main/src/main/java/org/apache/poi/hssf/model/InternalSheet.java diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/main/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/InternalWorkbook.java rename to main/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java diff --git a/src/java/org/apache/poi/hssf/model/LinkTable.java b/main/src/main/java/org/apache/poi/hssf/model/LinkTable.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/LinkTable.java rename to main/src/main/java/org/apache/poi/hssf/model/LinkTable.java diff --git a/src/java/org/apache/poi/hssf/model/RecordOrderer.java b/main/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/RecordOrderer.java rename to main/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java diff --git a/src/java/org/apache/poi/hssf/model/RecordStream.java b/main/src/main/java/org/apache/poi/hssf/model/RecordStream.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/RecordStream.java rename to main/src/main/java/org/apache/poi/hssf/model/RecordStream.java diff --git a/src/java/org/apache/poi/hssf/model/RowBlocksReader.java b/main/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/RowBlocksReader.java rename to main/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java diff --git a/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java b/main/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/WorkbookRecordList.java rename to main/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java diff --git a/src/java/org/apache/poi/hssf/model/package-info.java b/main/src/main/java/org/apache/poi/hssf/model/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/model/package-info.java rename to main/src/main/java/org/apache/poi/hssf/model/package-info.java diff --git a/src/java/org/apache/poi/hssf/package-info.java b/main/src/main/java/org/apache/poi/hssf/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/package-info.java rename to main/src/main/java/org/apache/poi/hssf/package-info.java diff --git a/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java b/main/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ArrayRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ArrayRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java diff --git a/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java diff --git a/src/java/org/apache/poi/hssf/record/BOFRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BOFRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BOFRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/BOFRecord.java diff --git a/src/java/org/apache/poi/hssf/record/BackupRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BackupRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BackupRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/BackupRecord.java diff --git a/src/java/org/apache/poi/hssf/record/BiffHeaderInput.java b/main/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BiffHeaderInput.java rename to main/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java diff --git a/src/java/org/apache/poi/hssf/record/BlankRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BlankRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BlankRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/BlankRecord.java diff --git a/src/java/org/apache/poi/hssf/record/BookBoolRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BookBoolRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java diff --git a/src/java/org/apache/poi/hssf/record/BoolErrRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BoolErrRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java diff --git a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BottomMarginRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java diff --git a/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/BoundSheetRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CFHeader12Record.java b/main/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CFHeader12Record.java rename to main/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java b/main/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CFHeaderBase.java rename to main/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CFHeaderRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CFRule12Record.java b/main/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CFRule12Record.java rename to main/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java diff --git a/src/java/org/apache/poi/hssf/record/CFRuleBase.java b/main/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CFRuleBase.java rename to main/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java diff --git a/src/java/org/apache/poi/hssf/record/CFRuleRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CFRuleRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CRNCountRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CRNCountRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CRNRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CRNRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CRNRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CRNRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CalcCountRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CalcModeRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CellRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CellRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CellRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CellRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CellValueRecordInterface.java b/main/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CellValueRecordInterface.java rename to main/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java diff --git a/src/java/org/apache/poi/hssf/record/CodepageRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CodepageRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ContinueRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java diff --git a/src/java/org/apache/poi/hssf/record/CountryRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CountryRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/CountryRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/CountryRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DBCellRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DConRefRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DConRefRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DSFRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DSFRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DSFRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DSFRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DVALRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DVALRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DVALRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DVALRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DVRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DVRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DVRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DVRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java b/main/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DateWindow1904Record.java rename to main/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java diff --git a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DeltaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DeltaRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DimensionsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DrawingRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DrawingRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java diff --git a/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java rename to main/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java diff --git a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java diff --git a/src/java/org/apache/poi/hssf/record/EOFRecord.java b/main/src/main/java/org/apache/poi/hssf/record/EOFRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/EOFRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/EOFRecord.java diff --git a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/EndSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/EscherAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/EscherAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ExtSSTRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ExternSheetRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ExternalNameRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FeatHdrRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FeatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FeatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FeatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FeatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FilePassRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FileSharingRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FontRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FontRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FontRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FontRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FooterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FooterRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FooterRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FooterRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FormulaRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java b/main/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java rename to main/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java diff --git a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FtCfSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/GridsetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/GridsetRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java diff --git a/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/GutsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/GutsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/GutsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/GutsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/HCenterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HCenterRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java diff --git a/src/java/org/apache/poi/hssf/record/HSSFRecordTypes.java b/main/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HSSFRecordTypes.java rename to main/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java diff --git a/src/java/org/apache/poi/hssf/record/HeaderFooterBase.java b/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HeaderFooterBase.java rename to main/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java diff --git a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java diff --git a/src/java/org/apache/poi/hssf/record/HeaderRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HeaderRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java diff --git a/src/java/org/apache/poi/hssf/record/HideObjRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HideObjRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java diff --git a/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/HyperlinkRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java diff --git a/src/java/org/apache/poi/hssf/record/IndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/IndexRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/IndexRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/IndexRecord.java diff --git a/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java b/main/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java diff --git a/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java b/main/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java diff --git a/src/java/org/apache/poi/hssf/record/IterationRecord.java b/main/src/main/java/org/apache/poi/hssf/record/IterationRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/IterationRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/IterationRecord.java diff --git a/src/java/org/apache/poi/hssf/record/LabelRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LabelRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/LabelRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/LabelRecord.java diff --git a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/LabelSSTRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java diff --git a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/LeftMarginRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java diff --git a/src/java/org/apache/poi/hssf/record/MMSRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MMSRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/MMSRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/MMSRecord.java diff --git a/src/java/org/apache/poi/hssf/record/Margin.java b/main/src/main/java/org/apache/poi/hssf/record/Margin.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/Margin.java rename to main/src/main/java/org/apache/poi/hssf/record/Margin.java diff --git a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/MergeCellsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/MulBlankRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java diff --git a/src/java/org/apache/poi/hssf/record/MulRKRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/MulRKRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java diff --git a/src/java/org/apache/poi/hssf/record/NameCommentRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/NameCommentRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java diff --git a/src/java/org/apache/poi/hssf/record/NameRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NameRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/NameRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/NameRecord.java diff --git a/src/java/org/apache/poi/hssf/record/NoteRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NoteRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/NoteRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/NoteRecord.java diff --git a/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/NumberRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NumberRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/NumberRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/NumberRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ObjRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ObjRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ObjRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/OldCellRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/OldCellRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java diff --git a/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/OldFormulaRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java diff --git a/src/java/org/apache/poi/hssf/record/OldLabelRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/OldLabelRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java diff --git a/src/java/org/apache/poi/hssf/record/OldSheetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/OldSheetRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java diff --git a/src/java/org/apache/poi/hssf/record/OldStringRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/OldStringRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PageBreakRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PageBreakRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PaletteRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PaletteRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PaneRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PaneRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PaneRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PaneRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PasswordRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PasswordRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java b/main/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PasswordRev4Record.java rename to main/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java diff --git a/src/java/org/apache/poi/hssf/record/PrecisionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PrecisionRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java diff --git a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/PrintSetupRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ProtectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java b/main/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java rename to main/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java diff --git a/src/java/org/apache/poi/hssf/record/RKRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RKRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RKRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/RKRecord.java diff --git a/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RecalcIdRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java diff --git a/src/java/org/apache/poi/hssf/record/Record.java b/main/src/main/java/org/apache/poi/hssf/record/Record.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/Record.java rename to main/src/main/java/org/apache/poi/hssf/record/Record.java diff --git a/src/java/org/apache/poi/hssf/record/RecordBase.java b/main/src/main/java/org/apache/poi/hssf/record/RecordBase.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RecordBase.java rename to main/src/main/java/org/apache/poi/hssf/record/RecordBase.java diff --git a/src/java/org/apache/poi/hssf/record/RecordFactory.java b/main/src/main/java/org/apache/poi/hssf/record/RecordFactory.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RecordFactory.java rename to main/src/main/java/org/apache/poi/hssf/record/RecordFactory.java diff --git a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java b/main/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java rename to main/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java diff --git a/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/main/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RecordInputStream.java rename to main/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java diff --git a/src/java/org/apache/poi/hssf/record/RefModeRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RefModeRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java diff --git a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RefreshAllRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java diff --git a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RightMarginRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java diff --git a/src/java/org/apache/poi/hssf/record/RowRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RowRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/RowRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/RowRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SCLRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SCLRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SCLRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/SCLRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SSTDeserializer.java b/main/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SSTDeserializer.java rename to main/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java diff --git a/src/java/org/apache/poi/hssf/record/SSTRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SSTRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SSTRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/SSTRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SSTSerializer.java b/main/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SSTSerializer.java rename to main/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java diff --git a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java diff --git a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SelectionRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java b/main/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java rename to main/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java diff --git a/src/java/org/apache/poi/hssf/record/StandardRecord.java b/main/src/main/java/org/apache/poi/hssf/record/StandardRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/StandardRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/StandardRecord.java diff --git a/src/java/org/apache/poi/hssf/record/StringRecord.java b/main/src/main/java/org/apache/poi/hssf/record/StringRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/StringRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/StringRecord.java diff --git a/src/java/org/apache/poi/hssf/record/StyleRecord.java b/main/src/main/java/org/apache/poi/hssf/record/StyleRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/StyleRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/StyleRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SubRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SubRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/SubRecord.java diff --git a/src/java/org/apache/poi/hssf/record/SupBookRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/SupBookRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java diff --git a/src/java/org/apache/poi/hssf/record/TabIdRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/TabIdRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java diff --git a/src/java/org/apache/poi/hssf/record/TableRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TableRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/TableRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/TableRecord.java diff --git a/src/java/org/apache/poi/hssf/record/TableStylesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/TableStylesRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java diff --git a/src/java/org/apache/poi/hssf/record/TextObjectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/TextObjectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/TopMarginRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java diff --git a/src/java/org/apache/poi/hssf/record/UncalcedRecord.java b/main/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/UncalcedRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java diff --git a/src/java/org/apache/poi/hssf/record/UnknownRecord.java b/main/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/UnknownRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java diff --git a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/main/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/UseSelFSRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java diff --git a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java b/main/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/UserSViewBegin.java rename to main/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java diff --git a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java b/main/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/UserSViewEnd.java rename to main/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java diff --git a/src/java/org/apache/poi/hssf/record/VCenterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/VCenterRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java diff --git a/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java b/main/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java diff --git a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/WSBoolRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java diff --git a/src/java/org/apache/poi/hssf/record/WindowOneRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/WindowOneRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java diff --git a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/WindowProtectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/WindowTwoRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java diff --git a/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/WriteAccessRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java diff --git a/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/WriteProtectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java diff --git a/src/java/org/apache/poi/hssf/record/aggregates/package-info.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/aggregates/package-info.java rename to main/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java diff --git a/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java diff --git a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/FontFormatting.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java diff --git a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java diff --git a/src/java/org/apache/poi/hssf/record/cf/Threshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cf/Threshold.java rename to main/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java diff --git a/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/AreaRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/AxisRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/BarRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/BarRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/BeginRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/CatLabRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/CatLabRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/DatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/DatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/EndRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/FrameRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/LegendRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/TextRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/TextRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/TickRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/TickRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java diff --git a/src/java/org/apache/poi/hssf/record/common/ExtRst.java b/main/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/ExtRst.java rename to main/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java diff --git a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java b/main/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/ExtendedColor.java rename to main/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java diff --git a/src/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java b/main/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java rename to main/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java diff --git a/src/java/org/apache/poi/hssf/record/common/FeatProtection.java b/main/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/FeatProtection.java rename to main/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java diff --git a/src/java/org/apache/poi/hssf/record/common/FeatSmartTag.java b/main/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/FeatSmartTag.java rename to main/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java diff --git a/src/java/org/apache/poi/hssf/record/common/FormatRun.java b/main/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/FormatRun.java rename to main/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java diff --git a/src/java/org/apache/poi/hssf/record/common/FtrHeader.java b/main/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/FtrHeader.java rename to main/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java diff --git a/src/java/org/apache/poi/hssf/record/common/FutureRecord.java b/main/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/FutureRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java diff --git a/src/java/org/apache/poi/hssf/record/common/PhRun.java b/main/src/main/java/org/apache/poi/hssf/record/common/PhRun.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/PhRun.java rename to main/src/main/java/org/apache/poi/hssf/record/common/PhRun.java diff --git a/src/java/org/apache/poi/hssf/record/common/SharedFeature.java b/main/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/SharedFeature.java rename to main/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java diff --git a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java b/main/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/common/UnicodeString.java rename to main/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java rename to main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java rename to main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java diff --git a/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java b/main/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java rename to main/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java diff --git a/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java b/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java rename to main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java diff --git a/src/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java b/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java rename to main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java diff --git a/src/java/org/apache/poi/hssf/record/package-info.java b/main/src/main/java/org/apache/poi/hssf/record/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/package-info.java rename to main/src/main/java/org/apache/poi/hssf/record/package-info.java diff --git a/src/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java diff --git a/src/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java similarity index 100% rename from src/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java rename to main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java diff --git a/src/java/org/apache/poi/hssf/usermodel/DVConstraint.java b/main/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/DVConstraint.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java b/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java b/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java diff --git a/src/java/org/apache/poi/hssf/usermodel/FontDetails.java b/main/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/FontDetails.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFCell.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFChart.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFChart.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFComment.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFFont.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFName.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFRow.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFShape.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java diff --git a/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java diff --git a/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java b/main/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java diff --git a/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java diff --git a/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java diff --git a/src/java/org/apache/poi/hssf/usermodel/package-info.java b/main/src/main/java/org/apache/poi/hssf/usermodel/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/usermodel/package-info.java rename to main/src/main/java/org/apache/poi/hssf/usermodel/package-info.java diff --git a/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java b/main/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java similarity index 100% rename from src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java rename to main/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java diff --git a/src/java/org/apache/poi/hssf/util/HSSFColor.java b/main/src/main/java/org/apache/poi/hssf/util/HSSFColor.java similarity index 100% rename from src/java/org/apache/poi/hssf/util/HSSFColor.java rename to main/src/main/java/org/apache/poi/hssf/util/HSSFColor.java diff --git a/src/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java b/main/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java similarity index 100% rename from src/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java rename to main/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java diff --git a/src/java/org/apache/poi/hssf/util/RKUtil.java b/main/src/main/java/org/apache/poi/hssf/util/RKUtil.java similarity index 100% rename from src/java/org/apache/poi/hssf/util/RKUtil.java rename to main/src/main/java/org/apache/poi/hssf/util/RKUtil.java diff --git a/src/java/org/apache/poi/hssf/util/package-info.java b/main/src/main/java/org/apache/poi/hssf/util/package-info.java similarity index 100% rename from src/java/org/apache/poi/hssf/util/package-info.java rename to main/src/main/java/org/apache/poi/hssf/util/package-info.java diff --git a/src/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java b/main/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java similarity index 100% rename from src/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java rename to main/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java diff --git a/src/java/org/apache/poi/poifs/common/POIFSConstants.java b/main/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java similarity index 100% rename from src/java/org/apache/poi/poifs/common/POIFSConstants.java rename to main/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java diff --git a/src/java/org/apache/poi/poifs/common/package-info.java b/main/src/main/java/org/apache/poi/poifs/common/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/common/package-info.java rename to main/src/main/java/org/apache/poi/poifs/common/package-info.java diff --git a/src/java/org/apache/poi/poifs/crypt/ChainingMode.java b/main/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/ChainingMode.java rename to main/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java diff --git a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java rename to main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java diff --git a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java rename to main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java diff --git a/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java b/main/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java rename to main/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java diff --git a/src/java/org/apache/poi/poifs/crypt/CipherProvider.java b/main/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/CipherProvider.java rename to main/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java diff --git a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/main/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java rename to main/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java diff --git a/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java b/main/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java rename to main/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java diff --git a/src/java/org/apache/poi/poifs/crypt/Decryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/Decryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java rename to main/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java rename to main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java rename to main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionMode.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/EncryptionMode.java rename to main/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java rename to main/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java diff --git a/src/java/org/apache/poi/poifs/crypt/Encryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/Encryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/HashAlgorithm.java b/main/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/HashAlgorithm.java rename to main/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/KeyData.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/KeyData.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java rename to main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java rename to main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java rename to main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java rename to main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java rename to main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java rename to main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java rename to main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java rename to main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/package-info.java b/main/src/main/java/org/apache/poi/poifs/crypt/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/package-info.java rename to main/src/main/java/org/apache/poi/poifs/crypt/package-info.java diff --git a/src/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java rename to main/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java rename to main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java rename to main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java rename to main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java rename to main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java rename to main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java rename to main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java rename to main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java diff --git a/src/java/org/apache/poi/poifs/dev/POIFSDump.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java similarity index 100% rename from src/java/org/apache/poi/poifs/dev/POIFSDump.java rename to main/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java diff --git a/src/java/org/apache/poi/poifs/dev/POIFSLister.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java similarity index 100% rename from src/java/org/apache/poi/poifs/dev/POIFSLister.java rename to main/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java diff --git a/src/java/org/apache/poi/poifs/dev/POIFSViewEngine.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java similarity index 100% rename from src/java/org/apache/poi/poifs/dev/POIFSViewEngine.java rename to main/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java diff --git a/src/java/org/apache/poi/poifs/dev/POIFSViewable.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java similarity index 100% rename from src/java/org/apache/poi/poifs/dev/POIFSViewable.java rename to main/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java diff --git a/src/java/org/apache/poi/poifs/dev/POIFSViewer.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java similarity index 100% rename from src/java/org/apache/poi/poifs/dev/POIFSViewer.java rename to main/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java diff --git a/src/java/org/apache/poi/poifs/dev/package-info.java b/main/src/main/java/org/apache/poi/poifs/dev/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/dev/package-info.java rename to main/src/main/java/org/apache/poi/poifs/dev/package-info.java diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java similarity index 100% rename from src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java rename to main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java similarity index 100% rename from src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java rename to main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java similarity index 100% rename from src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java rename to main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java similarity index 100% rename from src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java rename to main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/package-info.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/eventfilesystem/package-info.java rename to main/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java diff --git a/src/java/org/apache/poi/poifs/filesystem/BATManaged.java b/main/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/BATManaged.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java diff --git a/src/java/org/apache/poi/poifs/filesystem/BlockStore.java b/main/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/BlockStore.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentEntry.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DocumentEntry.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DocumentNode.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java diff --git a/src/java/org/apache/poi/poifs/filesystem/Entry.java b/main/src/main/java/org/apache/poi/poifs/filesystem/Entry.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/Entry.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/Entry.java diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/EntryNode.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java b/main/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/EntryUtils.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java diff --git a/src/java/org/apache/poi/poifs/filesystem/FileMagic.java b/main/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/FileMagic.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java diff --git a/src/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java diff --git a/src/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java b/main/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java diff --git a/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java b/main/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java diff --git a/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java b/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/Ole10Native.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java diff --git a/src/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java b/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSStream.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/POIFSStream.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java diff --git a/src/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java b/main/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java diff --git a/src/java/org/apache/poi/poifs/filesystem/package-info.java b/main/src/main/java/org/apache/poi/poifs/filesystem/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/filesystem/package-info.java rename to main/src/main/java/org/apache/poi/poifs/filesystem/package-info.java diff --git a/src/java/org/apache/poi/poifs/macros/Module.java b/main/src/main/java/org/apache/poi/poifs/macros/Module.java similarity index 100% rename from src/java/org/apache/poi/poifs/macros/Module.java rename to main/src/main/java/org/apache/poi/poifs/macros/Module.java diff --git a/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java b/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java similarity index 100% rename from src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java rename to main/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java diff --git a/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java b/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java similarity index 100% rename from src/java/org/apache/poi/poifs/macros/VBAMacroReader.java rename to main/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java diff --git a/src/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java b/main/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java similarity index 100% rename from src/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java rename to main/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java diff --git a/src/java/org/apache/poi/poifs/nio/CleanerUtil.java b/main/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java similarity index 100% rename from src/java/org/apache/poi/poifs/nio/CleanerUtil.java rename to main/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java diff --git a/src/java/org/apache/poi/poifs/nio/DataSource.java b/main/src/main/java/org/apache/poi/poifs/nio/DataSource.java similarity index 100% rename from src/java/org/apache/poi/poifs/nio/DataSource.java rename to main/src/main/java/org/apache/poi/poifs/nio/DataSource.java diff --git a/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java b/main/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java similarity index 100% rename from src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java rename to main/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java diff --git a/src/java/org/apache/poi/poifs/package-info.java b/main/src/main/java/org/apache/poi/poifs/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/package-info.java rename to main/src/main/java/org/apache/poi/poifs/package-info.java diff --git a/src/java/org/apache/poi/poifs/property/Child.java b/main/src/main/java/org/apache/poi/poifs/property/Child.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/Child.java rename to main/src/main/java/org/apache/poi/poifs/property/Child.java diff --git a/src/java/org/apache/poi/poifs/property/DirectoryProperty.java b/main/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/DirectoryProperty.java rename to main/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java diff --git a/src/java/org/apache/poi/poifs/property/DocumentProperty.java b/main/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/DocumentProperty.java rename to main/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java diff --git a/src/java/org/apache/poi/poifs/property/Parent.java b/main/src/main/java/org/apache/poi/poifs/property/Parent.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/Parent.java rename to main/src/main/java/org/apache/poi/poifs/property/Parent.java diff --git a/src/java/org/apache/poi/poifs/property/Property.java b/main/src/main/java/org/apache/poi/poifs/property/Property.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/Property.java rename to main/src/main/java/org/apache/poi/poifs/property/Property.java diff --git a/src/java/org/apache/poi/poifs/property/PropertyConstants.java b/main/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/PropertyConstants.java rename to main/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java diff --git a/src/java/org/apache/poi/poifs/property/PropertyFactory.java b/main/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/PropertyFactory.java rename to main/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java diff --git a/src/java/org/apache/poi/poifs/property/PropertyTable.java b/main/src/main/java/org/apache/poi/poifs/property/PropertyTable.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/PropertyTable.java rename to main/src/main/java/org/apache/poi/poifs/property/PropertyTable.java diff --git a/src/java/org/apache/poi/poifs/property/RootProperty.java b/main/src/main/java/org/apache/poi/poifs/property/RootProperty.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/RootProperty.java rename to main/src/main/java/org/apache/poi/poifs/property/RootProperty.java diff --git a/src/java/org/apache/poi/poifs/property/package-info.java b/main/src/main/java/org/apache/poi/poifs/property/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/property/package-info.java rename to main/src/main/java/org/apache/poi/poifs/property/package-info.java diff --git a/src/java/org/apache/poi/poifs/storage/BATBlock.java b/main/src/main/java/org/apache/poi/poifs/storage/BATBlock.java similarity index 100% rename from src/java/org/apache/poi/poifs/storage/BATBlock.java rename to main/src/main/java/org/apache/poi/poifs/storage/BATBlock.java diff --git a/src/java/org/apache/poi/poifs/storage/BlockWritable.java b/main/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java similarity index 100% rename from src/java/org/apache/poi/poifs/storage/BlockWritable.java rename to main/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java diff --git a/src/java/org/apache/poi/poifs/storage/HeaderBlock.java b/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java similarity index 100% rename from src/java/org/apache/poi/poifs/storage/HeaderBlock.java rename to main/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java diff --git a/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java b/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java similarity index 100% rename from src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java rename to main/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java diff --git a/src/java/org/apache/poi/poifs/storage/package-info.java b/main/src/main/java/org/apache/poi/poifs/storage/package-info.java similarity index 100% rename from src/java/org/apache/poi/poifs/storage/package-info.java rename to main/src/main/java/org/apache/poi/poifs/storage/package-info.java diff --git a/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java b/main/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java rename to main/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java diff --git a/src/java/org/apache/poi/sl/draw/DrawAutoShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawAutoShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawBackground.java b/main/src/main/java/org/apache/poi/sl/draw/DrawBackground.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawBackground.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawBackground.java diff --git a/src/java/org/apache/poi/sl/draw/DrawConnectorShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawConnectorShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawFactory.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFactory.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawFactory.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawFactory.java diff --git a/src/java/org/apache/poi/sl/draw/DrawFontInfo.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawFontInfo.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java diff --git a/src/java/org/apache/poi/sl/draw/DrawFontManager.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawFontManager.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java diff --git a/src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java diff --git a/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawFreeformShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java b/main/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java diff --git a/src/java/org/apache/poi/sl/draw/DrawGroupShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawGroupShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawMasterSheet.java b/main/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawMasterSheet.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java diff --git a/src/java/org/apache/poi/sl/draw/DrawNotImplemented.java b/main/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawNotImplemented.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java diff --git a/src/java/org/apache/poi/sl/draw/DrawNothing.java b/main/src/main/java/org/apache/poi/sl/draw/DrawNothing.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawNothing.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawNothing.java diff --git a/src/java/org/apache/poi/sl/draw/DrawPaint.java b/main/src/main/java/org/apache/poi/sl/draw/DrawPaint.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawPaint.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawPaint.java diff --git a/src/java/org/apache/poi/sl/draw/DrawPictureShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawPictureShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawSheet.java b/main/src/main/java/org/apache/poi/sl/draw/DrawSheet.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawSheet.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawSheet.java diff --git a/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawSimpleShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawSlide.java b/main/src/main/java/org/apache/poi/sl/draw/DrawSlide.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawSlide.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawSlide.java diff --git a/src/java/org/apache/poi/sl/draw/DrawTableShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawTableShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawTextBox.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawTextBox.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java diff --git a/src/java/org/apache/poi/sl/draw/DrawTextFragment.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawTextFragment.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java diff --git a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawTextParagraph.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java diff --git a/src/java/org/apache/poi/sl/draw/DrawTextShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawTextShape.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java diff --git a/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/DrawTexturePaint.java rename to main/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java diff --git a/src/java/org/apache/poi/sl/draw/Drawable.java b/main/src/main/java/org/apache/poi/sl/draw/Drawable.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/Drawable.java rename to main/src/main/java/org/apache/poi/sl/draw/Drawable.java diff --git a/src/java/org/apache/poi/sl/draw/EmbeddedExtractor.java b/main/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/EmbeddedExtractor.java rename to main/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java diff --git a/src/java/org/apache/poi/sl/draw/ImageRenderer.java b/main/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/ImageRenderer.java rename to main/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java diff --git a/src/java/org/apache/poi/sl/draw/PathGradientPaint.java b/main/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/PathGradientPaint.java rename to main/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java diff --git a/src/java/org/apache/poi/sl/draw/SLGraphics.java b/main/src/main/java/org/apache/poi/sl/draw/SLGraphics.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/SLGraphics.java rename to main/src/main/java/org/apache/poi/sl/draw/SLGraphics.java diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustPoint.java b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/AdjustPoint.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/AdjustValue.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java diff --git a/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java diff --git a/src/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java b/main/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java diff --git a/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java diff --git a/src/java/org/apache/poi/sl/draw/geom/ConnectionSite.java b/main/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/ConnectionSite.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java diff --git a/src/java/org/apache/poi/sl/draw/geom/Context.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Context.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/Context.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/Context.java diff --git a/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java diff --git a/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java b/main/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java diff --git a/src/java/org/apache/poi/sl/draw/geom/Formula.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Formula.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/Formula.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/Formula.java diff --git a/src/java/org/apache/poi/sl/draw/geom/Guide.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Guide.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/Guide.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/Guide.java diff --git a/src/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java b/main/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java diff --git a/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/LineToCommand.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java diff --git a/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java diff --git a/src/java/org/apache/poi/sl/draw/geom/Outline.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Outline.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/Outline.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/Outline.java diff --git a/src/java/org/apache/poi/sl/draw/geom/Path.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Path.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/Path.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/Path.java diff --git a/src/java/org/apache/poi/sl/draw/geom/PathCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/PathCommand.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java diff --git a/src/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java diff --git a/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java diff --git a/src/java/org/apache/poi/sl/draw/geom/PresetParser.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/PresetParser.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java diff --git a/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java diff --git a/src/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java b/main/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java similarity index 100% rename from src/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java rename to main/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java diff --git a/src/java/org/apache/poi/sl/extractor/SlideShowExtractor.java b/main/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java similarity index 100% rename from src/java/org/apache/poi/sl/extractor/SlideShowExtractor.java rename to main/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java similarity index 100% rename from src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java rename to main/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderEMF.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java similarity index 100% rename from src/java/org/apache/poi/sl/image/ImageHeaderEMF.java rename to main/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderPICT.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java similarity index 100% rename from src/java/org/apache/poi/sl/image/ImageHeaderPICT.java rename to main/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderPNG.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java similarity index 100% rename from src/java/org/apache/poi/sl/image/ImageHeaderPNG.java rename to main/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java similarity index 100% rename from src/java/org/apache/poi/sl/image/ImageHeaderWMF.java rename to main/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java diff --git a/src/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java rename to main/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java diff --git a/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java b/main/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java rename to main/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java diff --git a/src/java/org/apache/poi/sl/usermodel/AutoShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/AutoShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/Background.java b/main/src/main/java/org/apache/poi/sl/usermodel/Background.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Background.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Background.java diff --git a/src/java/org/apache/poi/sl/usermodel/ColorStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/ColorStyle.java rename to main/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java diff --git a/src/java/org/apache/poi/sl/usermodel/Comment.java b/main/src/main/java/org/apache/poi/sl/usermodel/Comment.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Comment.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Comment.java diff --git a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/ConnectorShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/FillStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/FillStyle.java rename to main/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java diff --git a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/FreeformShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java b/main/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java rename to main/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java diff --git a/src/java/org/apache/poi/sl/usermodel/GroupShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/GroupShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/Hyperlink.java b/main/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Hyperlink.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java diff --git a/src/java/org/apache/poi/sl/usermodel/Insets2D.java b/main/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Insets2D.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java diff --git a/src/java/org/apache/poi/sl/usermodel/Line.java b/main/src/main/java/org/apache/poi/sl/usermodel/Line.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Line.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Line.java diff --git a/src/java/org/apache/poi/sl/usermodel/LineDecoration.java b/main/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/LineDecoration.java rename to main/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java diff --git a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java b/main/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/MasterSheet.java rename to main/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java diff --git a/src/java/org/apache/poi/sl/usermodel/Notes.java b/main/src/main/java/org/apache/poi/sl/usermodel/Notes.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Notes.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Notes.java diff --git a/src/java/org/apache/poi/sl/usermodel/ObjectData.java b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/ObjectData.java rename to main/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java diff --git a/src/java/org/apache/poi/sl/usermodel/ObjectMetaData.java b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/ObjectMetaData.java rename to main/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java diff --git a/src/java/org/apache/poi/sl/usermodel/ObjectShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/ObjectShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/PaintStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/PaintStyle.java rename to main/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java diff --git a/src/java/org/apache/poi/sl/usermodel/PictureData.java b/main/src/main/java/org/apache/poi/sl/usermodel/PictureData.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/PictureData.java rename to main/src/main/java/org/apache/poi/sl/usermodel/PictureData.java diff --git a/src/java/org/apache/poi/sl/usermodel/PictureShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/PictureShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/PlaceableShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/Placeholder.java b/main/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Placeholder.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java b/main/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java rename to main/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java diff --git a/src/java/org/apache/poi/sl/usermodel/PresetColor.java b/main/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/PresetColor.java rename to main/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java diff --git a/src/java/org/apache/poi/sl/usermodel/RectAlign.java b/main/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/RectAlign.java rename to main/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java diff --git a/src/java/org/apache/poi/sl/usermodel/Shadow.java b/main/src/main/java/org/apache/poi/sl/usermodel/Shadow.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Shadow.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Shadow.java diff --git a/src/java/org/apache/poi/sl/usermodel/Shape.java b/main/src/main/java/org/apache/poi/sl/usermodel/Shape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Shape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Shape.java diff --git a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java b/main/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/ShapeContainer.java rename to main/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java diff --git a/src/java/org/apache/poi/sl/usermodel/ShapeType.java b/main/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/ShapeType.java rename to main/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java diff --git a/src/java/org/apache/poi/sl/usermodel/Sheet.java b/main/src/main/java/org/apache/poi/sl/usermodel/Sheet.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Sheet.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Sheet.java diff --git a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/SimpleShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/Slide.java b/main/src/main/java/org/apache/poi/sl/usermodel/Slide.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/Slide.java rename to main/src/main/java/org/apache/poi/sl/usermodel/Slide.java diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShow.java b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/SlideShow.java rename to main/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java rename to main/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShowProvider.java b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/SlideShowProvider.java rename to main/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java diff --git a/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/StrokeStyle.java rename to main/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java diff --git a/src/java/org/apache/poi/sl/usermodel/TabStop.java b/main/src/main/java/org/apache/poi/sl/usermodel/TabStop.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/TabStop.java rename to main/src/main/java/org/apache/poi/sl/usermodel/TabStop.java diff --git a/src/java/org/apache/poi/sl/usermodel/TableCell.java b/main/src/main/java/org/apache/poi/sl/usermodel/TableCell.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/TableCell.java rename to main/src/main/java/org/apache/poi/sl/usermodel/TableCell.java diff --git a/src/java/org/apache/poi/sl/usermodel/TableShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/TableShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/TableShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/TableShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/TextBox.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextBox.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/TextBox.java rename to main/src/main/java/org/apache/poi/sl/usermodel/TextBox.java diff --git a/src/java/org/apache/poi/sl/usermodel/TextParagraph.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/TextParagraph.java rename to main/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java diff --git a/src/java/org/apache/poi/sl/usermodel/TextRun.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextRun.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/TextRun.java rename to main/src/main/java/org/apache/poi/sl/usermodel/TextRun.java diff --git a/src/java/org/apache/poi/sl/usermodel/TextShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextShape.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/TextShape.java rename to main/src/main/java/org/apache/poi/sl/usermodel/TextShape.java diff --git a/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java b/main/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java similarity index 100% rename from src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java rename to main/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java diff --git a/src/java/org/apache/poi/ss/SpreadsheetVersion.java b/main/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java similarity index 100% rename from src/java/org/apache/poi/ss/SpreadsheetVersion.java rename to main/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java diff --git a/src/java/org/apache/poi/ss/extractor/EmbeddedData.java b/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java similarity index 100% rename from src/java/org/apache/poi/ss/extractor/EmbeddedData.java rename to main/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java diff --git a/src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java b/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java similarity index 100% rename from src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java rename to main/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java diff --git a/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java b/main/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java similarity index 100% rename from src/java/org/apache/poi/ss/extractor/ExcelExtractor.java rename to main/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java diff --git a/src/java/org/apache/poi/ss/format/CellDateFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellDateFormatter.java rename to main/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java diff --git a/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellElapsedFormatter.java rename to main/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java diff --git a/src/java/org/apache/poi/ss/format/CellFormat.java b/main/src/main/java/org/apache/poi/ss/format/CellFormat.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellFormat.java rename to main/src/main/java/org/apache/poi/ss/format/CellFormat.java diff --git a/src/java/org/apache/poi/ss/format/CellFormatCondition.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellFormatCondition.java rename to main/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java diff --git a/src/java/org/apache/poi/ss/format/CellFormatPart.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatPart.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellFormatPart.java rename to main/src/main/java/org/apache/poi/ss/format/CellFormatPart.java diff --git a/src/java/org/apache/poi/ss/format/CellFormatResult.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatResult.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellFormatResult.java rename to main/src/main/java/org/apache/poi/ss/format/CellFormatResult.java diff --git a/src/java/org/apache/poi/ss/format/CellFormatType.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatType.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellFormatType.java rename to main/src/main/java/org/apache/poi/ss/format/CellFormatType.java diff --git a/src/java/org/apache/poi/ss/format/CellFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellFormatter.java rename to main/src/main/java/org/apache/poi/ss/format/CellFormatter.java diff --git a/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellGeneralFormatter.java rename to main/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java diff --git a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellNumberFormatter.java rename to main/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java diff --git a/src/java/org/apache/poi/ss/format/CellNumberPartHandler.java b/main/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellNumberPartHandler.java rename to main/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java diff --git a/src/java/org/apache/poi/ss/format/CellNumberStringMod.java b/main/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellNumberStringMod.java rename to main/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java diff --git a/src/java/org/apache/poi/ss/format/CellTextFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/format/CellTextFormatter.java rename to main/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java diff --git a/src/java/org/apache/poi/ss/format/SimpleFraction.java b/main/src/main/java/org/apache/poi/ss/format/SimpleFraction.java similarity index 100% rename from src/java/org/apache/poi/ss/format/SimpleFraction.java rename to main/src/main/java/org/apache/poi/ss/format/SimpleFraction.java diff --git a/src/java/org/apache/poi/ss/format/package-info.java b/main/src/main/java/org/apache/poi/ss/format/package-info.java similarity index 100% rename from src/java/org/apache/poi/ss/format/package-info.java rename to main/src/main/java/org/apache/poi/ss/format/package-info.java diff --git a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/CacheAreaEval.java b/main/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/CacheAreaEval.java rename to main/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java diff --git a/src/java/org/apache/poi/ss/formula/CellCacheEntry.java b/main/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/CellCacheEntry.java rename to main/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java diff --git a/src/java/org/apache/poi/ss/formula/CellEvaluationFrame.java b/main/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/CellEvaluationFrame.java rename to main/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java diff --git a/src/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java b/main/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java rename to main/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java diff --git a/src/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/DataValidationEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/DataValidationEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/EvaluationCache.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/EvaluationCache.java rename to main/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java diff --git a/src/java/org/apache/poi/ss/formula/EvaluationCell.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/EvaluationCell.java rename to main/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java diff --git a/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java rename to main/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java diff --git a/src/java/org/apache/poi/ss/formula/EvaluationName.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationName.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/EvaluationName.java rename to main/src/main/java/org/apache/poi/ss/formula/EvaluationName.java diff --git a/src/java/org/apache/poi/ss/formula/EvaluationSheet.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/EvaluationSheet.java rename to main/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java diff --git a/src/java/org/apache/poi/ss/formula/EvaluationTracker.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/EvaluationTracker.java rename to main/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java diff --git a/src/java/org/apache/poi/ss/formula/EvaluationWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/EvaluationWorkbook.java rename to main/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java diff --git a/src/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java b/main/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java rename to main/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java diff --git a/src/java/org/apache/poi/ss/formula/Formula.java b/main/src/main/java/org/apache/poi/ss/formula/Formula.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/Formula.java rename to main/src/main/java/org/apache/poi/ss/formula/Formula.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaCellCache.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaCellCache.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaParseException.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaParseException.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaParser.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaParser.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaParser.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaParser.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaRenderer.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaRenderer.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaShifter.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaShifter.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaType.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaType.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaType.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaType.java diff --git a/src/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java rename to main/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java diff --git a/src/java/org/apache/poi/ss/formula/IEvaluationListener.java b/main/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/IEvaluationListener.java rename to main/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java diff --git a/src/java/org/apache/poi/ss/formula/IStabilityClassifier.java b/main/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/IStabilityClassifier.java rename to main/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java diff --git a/src/java/org/apache/poi/ss/formula/LazyAreaEval.java b/main/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/LazyAreaEval.java rename to main/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java diff --git a/src/java/org/apache/poi/ss/formula/LazyRefEval.java b/main/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/LazyRefEval.java rename to main/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java diff --git a/src/java/org/apache/poi/ss/formula/NameIdentifier.java b/main/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/NameIdentifier.java rename to main/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java diff --git a/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java b/main/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/OperandClassTransformer.java rename to main/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java rename to main/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java b/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java rename to main/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java diff --git a/src/java/org/apache/poi/ss/formula/ParseNode.java b/main/src/main/java/org/apache/poi/ss/formula/ParseNode.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ParseNode.java rename to main/src/main/java/org/apache/poi/ss/formula/ParseNode.java diff --git a/src/java/org/apache/poi/ss/formula/PlainCellCache.java b/main/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/PlainCellCache.java rename to main/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java diff --git a/src/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java b/main/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java rename to main/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java diff --git a/src/java/org/apache/poi/ss/formula/SharedFormula.java b/main/src/main/java/org/apache/poi/ss/formula/SharedFormula.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SharedFormula.java rename to main/src/main/java/org/apache/poi/ss/formula/SharedFormula.java diff --git a/src/java/org/apache/poi/ss/formula/SheetIdentifier.java b/main/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SheetIdentifier.java rename to main/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java diff --git a/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java b/main/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SheetNameFormatter.java rename to main/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java diff --git a/src/java/org/apache/poi/ss/formula/SheetRange.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRange.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SheetRange.java rename to main/src/main/java/org/apache/poi/ss/formula/SheetRange.java diff --git a/src/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java rename to main/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java diff --git a/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java rename to main/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java diff --git a/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/ThreeDEval.java b/main/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ThreeDEval.java rename to main/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java diff --git a/src/java/org/apache/poi/ss/formula/TwoDEval.java b/main/src/main/java/org/apache/poi/ss/formula/TwoDEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/TwoDEval.java rename to main/src/main/java/org/apache/poi/ss/formula/TwoDEval.java diff --git a/src/java/org/apache/poi/ss/formula/UserDefinedFunction.java b/main/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/UserDefinedFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java diff --git a/src/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java b/main/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java rename to main/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java diff --git a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java b/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java rename to main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java diff --git a/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java b/main/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java diff --git a/src/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/atp/DateParser.java b/main/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/DateParser.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java diff --git a/src/java/org/apache/poi/ss/formula/atp/IfError.java b/main/src/main/java/org/apache/poi/ss/formula/atp/IfError.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/IfError.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/IfError.java diff --git a/src/java/org/apache/poi/ss/formula/atp/MRound.java b/main/src/main/java/org/apache/poi/ss/formula/atp/MRound.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/MRound.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/MRound.java diff --git a/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java b/main/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java diff --git a/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java b/main/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/ParityFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java diff --git a/src/java/org/apache/poi/ss/formula/atp/RandBetween.java b/main/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/RandBetween.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java diff --git a/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java b/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java diff --git a/src/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java b/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java diff --git a/src/java/org/apache/poi/ss/formula/atp/YearFrac.java b/main/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/YearFrac.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java diff --git a/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java b/main/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java rename to main/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java diff --git a/src/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java b/main/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java rename to main/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java diff --git a/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java b/main/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java rename to main/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java diff --git a/src/java/org/apache/poi/ss/formula/eval/AreaEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/AreaEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java b/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java diff --git a/src/java/org/apache/poi/ss/formula/eval/BlankEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/BlankEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/BoolEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/BoolEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/ConcatEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/ErrorEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java b/main/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/EvaluationException.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java diff --git a/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/FunctionEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/NotImplementedException.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/NotImplementedException.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java diff --git a/src/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java diff --git a/src/java/org/apache/poi/ss/formula/eval/NumberEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/NumberEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java b/main/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/OperandResolver.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java diff --git a/src/java/org/apache/poi/ss/formula/eval/PercentEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/PercentEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/RangeEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/RangeEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/RefEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/RefEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java diff --git a/src/java/org/apache/poi/ss/formula/eval/RefListEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/RefListEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/StringEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/StringEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/StringValueEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java b/main/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java diff --git a/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/ValueEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/ValueEval.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java rename to main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java rename to main/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java rename to main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java rename to main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java rename to main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Address.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Address.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Address.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Address.java diff --git a/src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Areas.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Areas.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Areas.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Areas.java diff --git a/src/java/org/apache/poi/ss/formula/functions/ArrayFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/ArrayFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/ArrayMode.java b/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/ArrayMode.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java diff --git a/src/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java b/main/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Baseifs.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Baseifs.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java diff --git a/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Choose.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Choose.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Choose.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Choose.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Code.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Code.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Code.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Code.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Column.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Column.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Column.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Column.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Columns.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Columns.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Columns.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Columns.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Complex.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Complex.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Complex.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Complex.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Count.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Count.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Count.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Count.java diff --git a/src/java/org/apache/poi/ss/formula/functions/CountUtils.java b/main/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/CountUtils.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Counta.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Counta.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Counta.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Counta.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Countblank.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Countblank.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Countif.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Countif.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Countif.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Countif.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Countifs.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Countifs.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java diff --git a/src/java/org/apache/poi/ss/formula/functions/DGet.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DGet.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/DGet.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/DGet.java diff --git a/src/java/org/apache/poi/ss/formula/functions/DMax.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DMax.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/DMax.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/DMax.java diff --git a/src/java/org/apache/poi/ss/formula/functions/DMin.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DMin.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/DMin.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/DMin.java diff --git a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/DStarRunner.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java diff --git a/src/java/org/apache/poi/ss/formula/functions/DSum.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DSum.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/DSum.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/DSum.java diff --git a/src/java/org/apache/poi/ss/formula/functions/DateFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/DateFunc.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java diff --git a/src/java/org/apache/poi/ss/formula/functions/DateValue.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/DateValue.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Days360.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Days360.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Days360.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Days360.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Delta.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Delta.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Delta.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Delta.java diff --git a/src/java/org/apache/poi/ss/formula/functions/EDate.java b/main/src/main/java/org/apache/poi/ss/formula/functions/EDate.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/EDate.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/EDate.java diff --git a/src/java/org/apache/poi/ss/formula/functions/EOMonth.java b/main/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/EOMonth.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Errortype.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Errortype.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Even.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Even.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Even.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Even.java diff --git a/src/java/org/apache/poi/ss/formula/functions/FactDouble.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/FactDouble.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Finance.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Finance.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Finance.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Finance.java diff --git a/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/FinanceLib.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/FinanceLib.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Fixed.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Frequency.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Frequency.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Function.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Function.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Function.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Function0Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Function0Arg.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Function1Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Function1Arg.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Function2Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Function2Arg.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Function3Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Function3Arg.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Function4Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Function4Arg.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Hex2Dec.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Hex2Dec.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Hlookup.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Hlookup.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Hyperlink.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Hyperlink.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java diff --git a/src/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java b/main/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java diff --git a/src/java/org/apache/poi/ss/formula/functions/IPMT.java b/main/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/IPMT.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java diff --git a/src/java/org/apache/poi/ss/formula/functions/IfFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/IfFunc.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java diff --git a/src/java/org/apache/poi/ss/formula/functions/ImReal.java b/main/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/ImReal.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Imaginary.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Imaginary.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Index.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Index.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Index.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Index.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Indirect.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Indirect.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Intercept.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Intercept.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Irr.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Irr.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Irr.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Irr.java diff --git a/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Lookup.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Lookup.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java diff --git a/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java b/main/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/LookupUtils.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Match.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Match.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Match.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Match.java diff --git a/src/java/org/apache/poi/ss/formula/functions/MathX.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MathX.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/MathX.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/MathX.java diff --git a/src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/MinaMaxa.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/MinaMaxa.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Mirr.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Mirr.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Mode.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Mode.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Mode.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Mode.java diff --git a/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Na.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Na.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Na.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Na.java diff --git a/src/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Now.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Now.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Now.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Now.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Npv.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Npv.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Npv.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Npv.java diff --git a/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/NumericFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Oct2Dec.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Oct2Dec.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Odd.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Odd.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Odd.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Odd.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Offset.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Offset.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Offset.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Offset.java diff --git a/src/java/org/apache/poi/ss/formula/functions/PPMT.java b/main/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/PPMT.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Quotient.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Quotient.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Rank.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rank.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Rank.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Rank.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Rate.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rate.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Rate.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Rate.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Replace.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Replace.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Replace.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Replace.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Rept.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rept.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Rept.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Rept.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Roman.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Roman.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Roman.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Roman.java diff --git a/src/java/org/apache/poi/ss/formula/functions/RowFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/RowFunc.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Rows.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rows.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Rows.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Rows.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Single.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Single.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Single.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Single.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Slope.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Slope.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Slope.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Slope.java diff --git a/src/java/org/apache/poi/ss/formula/functions/StatsLib.java b/main/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/StatsLib.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Substitute.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Substitute.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Subtotal.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Subtotal.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumif.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Sumif.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumifs.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Sumifs.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Sumproduct.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumx2my2.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Sumx2my2.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumx2py2.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Sumx2py2.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumxmy2.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Sumxmy2.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java diff --git a/src/java/org/apache/poi/ss/formula/functions/T.java b/main/src/main/java/org/apache/poi/ss/formula/functions/T.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/T.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/T.java diff --git a/src/java/org/apache/poi/ss/formula/functions/TextFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/TextFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/TimeFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/TimeFunc.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Today.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Today.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Today.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Today.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Trend.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Trend.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Trend.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Trend.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Value.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Value.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Value.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Value.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java diff --git a/src/java/org/apache/poi/ss/formula/functions/Vlookup.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/Vlookup.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java diff --git a/src/java/org/apache/poi/ss/formula/functions/WeekNum.java b/main/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/WeekNum.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java diff --git a/src/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java diff --git a/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java rename to main/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java diff --git a/src/java/org/apache/poi/ss/formula/package-info.java b/main/src/main/java/org/apache/poi/ss/formula/package-info.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/package-info.java rename to main/src/main/java/org/apache/poi/ss/formula/package-info.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AddPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaI.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AreaI.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/BoolPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/BoolPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ControlPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ControlPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/DividePtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ErrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ErrPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/IntPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/NamePtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/NameXPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/NameXPxg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/OperandPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/OperandPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ptg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Ptg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Pxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Pxg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Pxg3D.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Pxg3D.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/RangePtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/RefPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/StringPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/TblPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java diff --git a/src/java/org/apache/poi/ss/formula/ptg/package-info.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/ptg/package-info.java rename to main/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java diff --git a/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java rename to main/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java diff --git a/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java rename to main/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java diff --git a/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java rename to main/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java diff --git a/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java similarity index 100% rename from src/java/org/apache/poi/ss/formula/udf/UDFFinder.java rename to main/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java diff --git a/src/java/org/apache/poi/ss/usermodel/AutoFilter.java b/main/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/AutoFilter.java rename to main/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java diff --git a/src/java/org/apache/poi/ss/usermodel/BorderExtent.java b/main/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/BorderExtent.java rename to main/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java diff --git a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/BorderFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/BorderStyle.java b/main/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/BorderStyle.java rename to main/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java diff --git a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java b/main/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java rename to main/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java diff --git a/src/java/org/apache/poi/ss/usermodel/Cell.java b/main/src/main/java/org/apache/poi/ss/usermodel/Cell.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Cell.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Cell.java diff --git a/src/java/org/apache/poi/ss/usermodel/CellBase.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellBase.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/CellBase.java rename to main/src/main/java/org/apache/poi/ss/usermodel/CellBase.java diff --git a/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java rename to main/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java diff --git a/src/java/org/apache/poi/ss/usermodel/CellRange.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellRange.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/CellRange.java rename to main/src/main/java/org/apache/poi/ss/usermodel/CellRange.java diff --git a/src/java/org/apache/poi/ss/usermodel/CellStyle.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/CellStyle.java rename to main/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java diff --git a/src/java/org/apache/poi/ss/usermodel/CellType.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellType.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/CellType.java rename to main/src/main/java/org/apache/poi/ss/usermodel/CellType.java diff --git a/src/java/org/apache/poi/ss/usermodel/CellValue.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellValue.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/CellValue.java rename to main/src/main/java/org/apache/poi/ss/usermodel/CellValue.java diff --git a/src/java/org/apache/poi/ss/usermodel/ChildAnchor.java b/main/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ChildAnchor.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java diff --git a/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java b/main/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ClientAnchor.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java diff --git a/src/java/org/apache/poi/ss/usermodel/Color.java b/main/src/main/java/org/apache/poi/ss/usermodel/Color.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Color.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Color.java diff --git a/src/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/Comment.java b/main/src/main/java/org/apache/poi/ss/usermodel/Comment.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Comment.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Comment.java diff --git a/src/java/org/apache/poi/ss/usermodel/ComparisonOperator.java b/main/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ComparisonOperator.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionFilterData.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ConditionFilterData.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionFilterType.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ConditionFilterType.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionType.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ConditionType.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp rename to main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java diff --git a/src/java/org/apache/poi/ss/usermodel/CreationHelper.java b/main/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/CreationHelper.java rename to main/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java diff --git a/src/java/org/apache/poi/ss/usermodel/DataBarFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DataBarFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java diff --git a/src/java/org/apache/poi/ss/usermodel/DataFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DataFormat.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java diff --git a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DataFormatter.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java diff --git a/src/java/org/apache/poi/ss/usermodel/DataValidation.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DataValidation.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java diff --git a/src/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java diff --git a/src/java/org/apache/poi/ss/usermodel/DataValidationHelper.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DataValidationHelper.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java diff --git a/src/java/org/apache/poi/ss/usermodel/Date1904Support.java b/main/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Date1904Support.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/main/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DateUtil.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java diff --git a/src/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java b/main/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java rename to main/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java diff --git a/src/java/org/apache/poi/ss/usermodel/Drawing.java b/main/src/main/java/org/apache/poi/ss/usermodel/Drawing.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Drawing.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Drawing.java diff --git a/src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java diff --git a/src/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java diff --git a/src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java diff --git a/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ExtendedColor.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java diff --git a/src/java/org/apache/poi/ss/usermodel/FillPatternType.java b/main/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FillPatternType.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java diff --git a/src/java/org/apache/poi/ss/usermodel/Font.java b/main/src/main/java/org/apache/poi/ss/usermodel/Font.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Font.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Font.java diff --git a/src/java/org/apache/poi/ss/usermodel/FontCharset.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FontCharset.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java diff --git a/src/java/org/apache/poi/ss/usermodel/FontFamily.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FontFamily.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java diff --git a/src/java/org/apache/poi/ss/usermodel/FontFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FontFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/FontScheme.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FontScheme.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java diff --git a/src/java/org/apache/poi/ss/usermodel/FontUnderline.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FontUnderline.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java diff --git a/src/java/org/apache/poi/ss/usermodel/Footer.java b/main/src/main/java/org/apache/poi/ss/usermodel/Footer.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Footer.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Footer.java diff --git a/src/java/org/apache/poi/ss/usermodel/FormulaError.java b/main/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FormulaError.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java diff --git a/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java b/main/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java diff --git a/src/java/org/apache/poi/ss/usermodel/FractionFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/FractionFormat.java rename to main/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java diff --git a/src/java/org/apache/poi/ss/usermodel/Header.java b/main/src/main/java/org/apache/poi/ss/usermodel/Header.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Header.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Header.java diff --git a/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java b/main/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/HeaderFooter.java rename to main/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java diff --git a/src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java b/main/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java rename to main/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java diff --git a/src/java/org/apache/poi/ss/usermodel/Hyperlink.java b/main/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Hyperlink.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java diff --git a/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java b/main/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java rename to main/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java diff --git a/src/java/org/apache/poi/ss/usermodel/IndexedColors.java b/main/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/IndexedColors.java rename to main/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java diff --git a/src/java/org/apache/poi/ss/usermodel/Name.java b/main/src/main/java/org/apache/poi/ss/usermodel/Name.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Name.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Name.java diff --git a/src/java/org/apache/poi/ss/usermodel/ObjectData.java b/main/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ObjectData.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java diff --git a/src/java/org/apache/poi/ss/usermodel/PageOrder.java b/main/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/PageOrder.java rename to main/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java diff --git a/src/java/org/apache/poi/ss/usermodel/PaperSize.java b/main/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/PaperSize.java rename to main/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java diff --git a/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/PatternFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/Picture.java b/main/src/main/java/org/apache/poi/ss/usermodel/Picture.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Picture.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Picture.java diff --git a/src/java/org/apache/poi/ss/usermodel/PictureData.java b/main/src/main/java/org/apache/poi/ss/usermodel/PictureData.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/PictureData.java rename to main/src/main/java/org/apache/poi/ss/usermodel/PictureData.java diff --git a/src/java/org/apache/poi/ss/usermodel/PrintCellComments.java b/main/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/PrintCellComments.java rename to main/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java diff --git a/src/java/org/apache/poi/ss/usermodel/PrintOrientation.java b/main/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/PrintOrientation.java rename to main/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java diff --git a/src/java/org/apache/poi/ss/usermodel/PrintSetup.java b/main/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/PrintSetup.java rename to main/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java diff --git a/src/java/org/apache/poi/ss/usermodel/RangeCopier.java b/main/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/RangeCopier.java rename to main/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java diff --git a/src/java/org/apache/poi/ss/usermodel/ReadingOrder.java b/main/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ReadingOrder.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java diff --git a/src/java/org/apache/poi/ss/usermodel/RichTextString.java b/main/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/RichTextString.java rename to main/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java diff --git a/src/java/org/apache/poi/ss/usermodel/Row.java b/main/src/main/java/org/apache/poi/ss/usermodel/Row.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Row.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Row.java diff --git a/src/java/org/apache/poi/ss/usermodel/Shape.java b/main/src/main/java/org/apache/poi/ss/usermodel/Shape.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Shape.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Shape.java diff --git a/src/java/org/apache/poi/ss/usermodel/ShapeContainer.java b/main/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ShapeContainer.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java diff --git a/src/java/org/apache/poi/ss/usermodel/ShapeTypes.java b/main/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/ShapeTypes.java rename to main/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java diff --git a/src/java/org/apache/poi/ss/usermodel/Sheet.java b/main/src/main/java/org/apache/poi/ss/usermodel/Sheet.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Sheet.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Sheet.java diff --git a/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java rename to main/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java diff --git a/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java b/main/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/SheetVisibility.java rename to main/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java diff --git a/src/java/org/apache/poi/ss/usermodel/SimpleShape.java b/main/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/SimpleShape.java rename to main/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java diff --git a/src/java/org/apache/poi/ss/usermodel/Table.java b/main/src/main/java/org/apache/poi/ss/usermodel/Table.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Table.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Table.java diff --git a/src/java/org/apache/poi/ss/usermodel/TableStyle.java b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/TableStyle.java rename to main/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java diff --git a/src/java/org/apache/poi/ss/usermodel/TableStyleInfo.java b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/TableStyleInfo.java rename to main/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java diff --git a/src/java/org/apache/poi/ss/usermodel/TableStyleType.java b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/TableStyleType.java rename to main/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java diff --git a/src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java b/main/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java rename to main/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java diff --git a/src/java/org/apache/poi/ss/usermodel/Workbook.java b/main/src/main/java/org/apache/poi/ss/usermodel/Workbook.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/Workbook.java rename to main/src/main/java/org/apache/poi/ss/usermodel/Workbook.java diff --git a/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java rename to main/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java diff --git a/src/java/org/apache/poi/ss/usermodel/WorkbookProvider.java b/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/WorkbookProvider.java rename to main/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java diff --git a/src/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java rename to main/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java diff --git a/src/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java rename to main/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java diff --git a/src/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java similarity index 100% rename from src/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java rename to main/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java diff --git a/src/java/org/apache/poi/ss/util/AreaReference.java b/main/src/main/java/org/apache/poi/ss/util/AreaReference.java similarity index 100% rename from src/java/org/apache/poi/ss/util/AreaReference.java rename to main/src/main/java/org/apache/poi/ss/util/AreaReference.java diff --git a/src/java/org/apache/poi/ss/util/CellAddress.java b/main/src/main/java/org/apache/poi/ss/util/CellAddress.java similarity index 100% rename from src/java/org/apache/poi/ss/util/CellAddress.java rename to main/src/main/java/org/apache/poi/ss/util/CellAddress.java diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddress.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java similarity index 100% rename from src/java/org/apache/poi/ss/util/CellRangeAddress.java rename to main/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java similarity index 100% rename from src/java/org/apache/poi/ss/util/CellRangeAddressBase.java rename to main/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddressList.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java similarity index 100% rename from src/java/org/apache/poi/ss/util/CellRangeAddressList.java rename to main/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java diff --git a/src/java/org/apache/poi/ss/util/CellRangeUtil.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java similarity index 100% rename from src/java/org/apache/poi/ss/util/CellRangeUtil.java rename to main/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java diff --git a/src/java/org/apache/poi/ss/util/CellReference.java b/main/src/main/java/org/apache/poi/ss/util/CellReference.java similarity index 100% rename from src/java/org/apache/poi/ss/util/CellReference.java rename to main/src/main/java/org/apache/poi/ss/util/CellReference.java diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/main/src/main/java/org/apache/poi/ss/util/CellUtil.java similarity index 100% rename from src/java/org/apache/poi/ss/util/CellUtil.java rename to main/src/main/java/org/apache/poi/ss/util/CellUtil.java diff --git a/src/java/org/apache/poi/ss/util/DateFormatConverter.java b/main/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java similarity index 100% rename from src/java/org/apache/poi/ss/util/DateFormatConverter.java rename to main/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java diff --git a/src/java/org/apache/poi/ss/util/DateParser.java b/main/src/main/java/org/apache/poi/ss/util/DateParser.java similarity index 100% rename from src/java/org/apache/poi/ss/util/DateParser.java rename to main/src/main/java/org/apache/poi/ss/util/DateParser.java diff --git a/src/java/org/apache/poi/ss/util/ExpandedDouble.java b/main/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java similarity index 100% rename from src/java/org/apache/poi/ss/util/ExpandedDouble.java rename to main/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java diff --git a/src/java/org/apache/poi/ss/util/IEEEDouble.java b/main/src/main/java/org/apache/poi/ss/util/IEEEDouble.java similarity index 100% rename from src/java/org/apache/poi/ss/util/IEEEDouble.java rename to main/src/main/java/org/apache/poi/ss/util/IEEEDouble.java diff --git a/src/java/org/apache/poi/ss/util/ImageUtils.java b/main/src/main/java/org/apache/poi/ss/util/ImageUtils.java similarity index 100% rename from src/java/org/apache/poi/ss/util/ImageUtils.java rename to main/src/main/java/org/apache/poi/ss/util/ImageUtils.java diff --git a/src/java/org/apache/poi/ss/util/MutableFPNumber.java b/main/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java similarity index 100% rename from src/java/org/apache/poi/ss/util/MutableFPNumber.java rename to main/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java diff --git a/src/java/org/apache/poi/ss/util/NormalisedDecimal.java b/main/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java similarity index 100% rename from src/java/org/apache/poi/ss/util/NormalisedDecimal.java rename to main/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java diff --git a/src/java/org/apache/poi/ss/util/NumberComparer.java b/main/src/main/java/org/apache/poi/ss/util/NumberComparer.java similarity index 100% rename from src/java/org/apache/poi/ss/util/NumberComparer.java rename to main/src/main/java/org/apache/poi/ss/util/NumberComparer.java diff --git a/src/java/org/apache/poi/ss/util/NumberToTextConverter.java b/main/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java similarity index 100% rename from src/java/org/apache/poi/ss/util/NumberToTextConverter.java rename to main/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java diff --git a/src/java/org/apache/poi/ss/util/PaneInformation.java b/main/src/main/java/org/apache/poi/ss/util/PaneInformation.java similarity index 100% rename from src/java/org/apache/poi/ss/util/PaneInformation.java rename to main/src/main/java/org/apache/poi/ss/util/PaneInformation.java diff --git a/src/java/org/apache/poi/ss/util/PropertyTemplate.java b/main/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java similarity index 100% rename from src/java/org/apache/poi/ss/util/PropertyTemplate.java rename to main/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java diff --git a/src/java/org/apache/poi/ss/util/RegionUtil.java b/main/src/main/java/org/apache/poi/ss/util/RegionUtil.java similarity index 100% rename from src/java/org/apache/poi/ss/util/RegionUtil.java rename to main/src/main/java/org/apache/poi/ss/util/RegionUtil.java diff --git a/src/java/org/apache/poi/ss/util/SSCellRange.java b/main/src/main/java/org/apache/poi/ss/util/SSCellRange.java similarity index 100% rename from src/java/org/apache/poi/ss/util/SSCellRange.java rename to main/src/main/java/org/apache/poi/ss/util/SSCellRange.java diff --git a/src/java/org/apache/poi/ss/util/SheetBuilder.java b/main/src/main/java/org/apache/poi/ss/util/SheetBuilder.java similarity index 100% rename from src/java/org/apache/poi/ss/util/SheetBuilder.java rename to main/src/main/java/org/apache/poi/ss/util/SheetBuilder.java diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/main/src/main/java/org/apache/poi/ss/util/SheetUtil.java similarity index 100% rename from src/java/org/apache/poi/ss/util/SheetUtil.java rename to main/src/main/java/org/apache/poi/ss/util/SheetUtil.java diff --git a/src/java/org/apache/poi/ss/util/WorkbookUtil.java b/main/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java similarity index 100% rename from src/java/org/apache/poi/ss/util/WorkbookUtil.java rename to main/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java diff --git a/src/java/org/apache/poi/ss/util/cellwalk/CellHandler.java b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java similarity index 100% rename from src/java/org/apache/poi/ss/util/cellwalk/CellHandler.java rename to main/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java diff --git a/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java similarity index 100% rename from src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java rename to main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java diff --git a/src/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java similarity index 100% rename from src/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java rename to main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java diff --git a/src/java/org/apache/poi/util/ArrayUtil.java b/main/src/main/java/org/apache/poi/util/ArrayUtil.java similarity index 100% rename from src/java/org/apache/poi/util/ArrayUtil.java rename to main/src/main/java/org/apache/poi/util/ArrayUtil.java diff --git a/src/java/org/apache/poi/util/Beta.java b/main/src/main/java/org/apache/poi/util/Beta.java similarity index 100% rename from src/java/org/apache/poi/util/Beta.java rename to main/src/main/java/org/apache/poi/util/Beta.java diff --git a/src/java/org/apache/poi/util/BitField.java b/main/src/main/java/org/apache/poi/util/BitField.java similarity index 100% rename from src/java/org/apache/poi/util/BitField.java rename to main/src/main/java/org/apache/poi/util/BitField.java diff --git a/src/java/org/apache/poi/util/BitFieldFactory.java b/main/src/main/java/org/apache/poi/util/BitFieldFactory.java similarity index 100% rename from src/java/org/apache/poi/util/BitFieldFactory.java rename to main/src/main/java/org/apache/poi/util/BitFieldFactory.java diff --git a/src/java/org/apache/poi/util/BoundedInputStream.java b/main/src/main/java/org/apache/poi/util/BoundedInputStream.java similarity index 100% rename from src/java/org/apache/poi/util/BoundedInputStream.java rename to main/src/main/java/org/apache/poi/util/BoundedInputStream.java diff --git a/src/java/org/apache/poi/util/ByteField.java b/main/src/main/java/org/apache/poi/util/ByteField.java similarity index 100% rename from src/java/org/apache/poi/util/ByteField.java rename to main/src/main/java/org/apache/poi/util/ByteField.java diff --git a/src/java/org/apache/poi/util/CloseIgnoringInputStream.java b/main/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java similarity index 100% rename from src/java/org/apache/poi/util/CloseIgnoringInputStream.java rename to main/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java diff --git a/src/java/org/apache/poi/util/CodePageUtil.java b/main/src/main/java/org/apache/poi/util/CodePageUtil.java similarity index 100% rename from src/java/org/apache/poi/util/CodePageUtil.java rename to main/src/main/java/org/apache/poi/util/CodePageUtil.java diff --git a/src/java/org/apache/poi/util/Configurator.java b/main/src/main/java/org/apache/poi/util/Configurator.java similarity index 100% rename from src/java/org/apache/poi/util/Configurator.java rename to main/src/main/java/org/apache/poi/util/Configurator.java diff --git a/src/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java b/main/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java similarity index 100% rename from src/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java rename to main/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java diff --git a/src/java/org/apache/poi/util/DelayableLittleEndianOutput.java b/main/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java similarity index 100% rename from src/java/org/apache/poi/util/DelayableLittleEndianOutput.java rename to main/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java diff --git a/src/java/org/apache/poi/util/Dimension2DDouble.java b/main/src/main/java/org/apache/poi/util/Dimension2DDouble.java similarity index 100% rename from src/java/org/apache/poi/util/Dimension2DDouble.java rename to main/src/main/java/org/apache/poi/util/Dimension2DDouble.java diff --git a/src/java/org/apache/poi/util/DocumentFormatException.java b/main/src/main/java/org/apache/poi/util/DocumentFormatException.java similarity index 100% rename from src/java/org/apache/poi/util/DocumentFormatException.java rename to main/src/main/java/org/apache/poi/util/DocumentFormatException.java diff --git a/src/java/org/apache/poi/util/DrawingDump.java b/main/src/main/java/org/apache/poi/util/DrawingDump.java similarity index 100% rename from src/java/org/apache/poi/util/DrawingDump.java rename to main/src/main/java/org/apache/poi/util/DrawingDump.java diff --git a/src/java/org/apache/poi/util/FixedField.java b/main/src/main/java/org/apache/poi/util/FixedField.java similarity index 100% rename from src/java/org/apache/poi/util/FixedField.java rename to main/src/main/java/org/apache/poi/util/FixedField.java diff --git a/src/java/org/apache/poi/util/FontMetricsDumper.java b/main/src/main/java/org/apache/poi/util/FontMetricsDumper.java similarity index 100% rename from src/java/org/apache/poi/util/FontMetricsDumper.java rename to main/src/main/java/org/apache/poi/util/FontMetricsDumper.java diff --git a/src/java/org/apache/poi/util/GenericRecordJsonWriter.java b/main/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java similarity index 100% rename from src/java/org/apache/poi/util/GenericRecordJsonWriter.java rename to main/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java diff --git a/src/java/org/apache/poi/util/GenericRecordUtil.java b/main/src/main/java/org/apache/poi/util/GenericRecordUtil.java similarity index 100% rename from src/java/org/apache/poi/util/GenericRecordUtil.java rename to main/src/main/java/org/apache/poi/util/GenericRecordUtil.java diff --git a/src/java/org/apache/poi/util/GenericRecordXmlWriter.java b/main/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java similarity index 100% rename from src/java/org/apache/poi/util/GenericRecordXmlWriter.java rename to main/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java diff --git a/src/java/org/apache/poi/util/HexDump.java b/main/src/main/java/org/apache/poi/util/HexDump.java similarity index 100% rename from src/java/org/apache/poi/util/HexDump.java rename to main/src/main/java/org/apache/poi/util/HexDump.java diff --git a/src/java/org/apache/poi/util/HexRead.java b/main/src/main/java/org/apache/poi/util/HexRead.java similarity index 100% rename from src/java/org/apache/poi/util/HexRead.java rename to main/src/main/java/org/apache/poi/util/HexRead.java diff --git a/src/java/org/apache/poi/util/IOUtils.java b/main/src/main/java/org/apache/poi/util/IOUtils.java similarity index 100% rename from src/java/org/apache/poi/util/IOUtils.java rename to main/src/main/java/org/apache/poi/util/IOUtils.java diff --git a/src/java/org/apache/poi/util/IntList.java b/main/src/main/java/org/apache/poi/util/IntList.java similarity index 100% rename from src/java/org/apache/poi/util/IntList.java rename to main/src/main/java/org/apache/poi/util/IntList.java diff --git a/src/java/org/apache/poi/util/IntMapper.java b/main/src/main/java/org/apache/poi/util/IntMapper.java similarity index 100% rename from src/java/org/apache/poi/util/IntMapper.java rename to main/src/main/java/org/apache/poi/util/IntMapper.java diff --git a/src/java/org/apache/poi/util/IntegerField.java b/main/src/main/java/org/apache/poi/util/IntegerField.java similarity index 100% rename from src/java/org/apache/poi/util/IntegerField.java rename to main/src/main/java/org/apache/poi/util/IntegerField.java diff --git a/src/java/org/apache/poi/util/Internal.java b/main/src/main/java/org/apache/poi/util/Internal.java similarity index 100% rename from src/java/org/apache/poi/util/Internal.java rename to main/src/main/java/org/apache/poi/util/Internal.java diff --git a/src/java/org/apache/poi/util/LZWDecompresser.java b/main/src/main/java/org/apache/poi/util/LZWDecompresser.java similarity index 100% rename from src/java/org/apache/poi/util/LZWDecompresser.java rename to main/src/main/java/org/apache/poi/util/LZWDecompresser.java diff --git a/src/java/org/apache/poi/util/LittleEndian.java b/main/src/main/java/org/apache/poi/util/LittleEndian.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndian.java rename to main/src/main/java/org/apache/poi/util/LittleEndian.java diff --git a/src/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java rename to main/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java diff --git a/src/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java rename to main/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java diff --git a/src/java/org/apache/poi/util/LittleEndianConsts.java b/main/src/main/java/org/apache/poi/util/LittleEndianConsts.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndianConsts.java rename to main/src/main/java/org/apache/poi/util/LittleEndianConsts.java diff --git a/src/java/org/apache/poi/util/LittleEndianInput.java b/main/src/main/java/org/apache/poi/util/LittleEndianInput.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndianInput.java rename to main/src/main/java/org/apache/poi/util/LittleEndianInput.java diff --git a/src/java/org/apache/poi/util/LittleEndianInputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianInputStream.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndianInputStream.java rename to main/src/main/java/org/apache/poi/util/LittleEndianInputStream.java diff --git a/src/java/org/apache/poi/util/LittleEndianOutput.java b/main/src/main/java/org/apache/poi/util/LittleEndianOutput.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndianOutput.java rename to main/src/main/java/org/apache/poi/util/LittleEndianOutput.java diff --git a/src/java/org/apache/poi/util/LittleEndianOutputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java similarity index 100% rename from src/java/org/apache/poi/util/LittleEndianOutputStream.java rename to main/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java diff --git a/src/java/org/apache/poi/util/LocaleID.java b/main/src/main/java/org/apache/poi/util/LocaleID.java similarity index 100% rename from src/java/org/apache/poi/util/LocaleID.java rename to main/src/main/java/org/apache/poi/util/LocaleID.java diff --git a/src/java/org/apache/poi/util/LocaleUtil.java b/main/src/main/java/org/apache/poi/util/LocaleUtil.java similarity index 100% rename from src/java/org/apache/poi/util/LocaleUtil.java rename to main/src/main/java/org/apache/poi/util/LocaleUtil.java diff --git a/src/java/org/apache/poi/util/LongField.java b/main/src/main/java/org/apache/poi/util/LongField.java similarity index 100% rename from src/java/org/apache/poi/util/LongField.java rename to main/src/main/java/org/apache/poi/util/LongField.java diff --git a/src/java/org/apache/poi/util/NotImplemented.java b/main/src/main/java/org/apache/poi/util/NotImplemented.java similarity index 100% rename from src/java/org/apache/poi/util/NotImplemented.java rename to main/src/main/java/org/apache/poi/util/NotImplemented.java diff --git a/src/java/org/apache/poi/util/RLEDecompressingInputStream.java b/main/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java similarity index 100% rename from src/java/org/apache/poi/util/RLEDecompressingInputStream.java rename to main/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java diff --git a/src/java/org/apache/poi/util/RecordFormatException.java b/main/src/main/java/org/apache/poi/util/RecordFormatException.java similarity index 100% rename from src/java/org/apache/poi/util/RecordFormatException.java rename to main/src/main/java/org/apache/poi/util/RecordFormatException.java diff --git a/src/java/org/apache/poi/util/Removal.java b/main/src/main/java/org/apache/poi/util/Removal.java similarity index 100% rename from src/java/org/apache/poi/util/Removal.java rename to main/src/main/java/org/apache/poi/util/Removal.java diff --git a/src/java/org/apache/poi/util/ReplacingInputStream.java b/main/src/main/java/org/apache/poi/util/ReplacingInputStream.java similarity index 100% rename from src/java/org/apache/poi/util/ReplacingInputStream.java rename to main/src/main/java/org/apache/poi/util/ReplacingInputStream.java diff --git a/src/java/org/apache/poi/util/ShortField.java b/main/src/main/java/org/apache/poi/util/ShortField.java similarity index 100% rename from src/java/org/apache/poi/util/ShortField.java rename to main/src/main/java/org/apache/poi/util/ShortField.java diff --git a/src/java/org/apache/poi/util/StaxHelper.java b/main/src/main/java/org/apache/poi/util/StaxHelper.java similarity index 100% rename from src/java/org/apache/poi/util/StaxHelper.java rename to main/src/main/java/org/apache/poi/util/StaxHelper.java diff --git a/src/java/org/apache/poi/util/StringCodepointsIterable.java b/main/src/main/java/org/apache/poi/util/StringCodepointsIterable.java similarity index 100% rename from src/java/org/apache/poi/util/StringCodepointsIterable.java rename to main/src/main/java/org/apache/poi/util/StringCodepointsIterable.java diff --git a/src/java/org/apache/poi/util/StringUtil.java b/main/src/main/java/org/apache/poi/util/StringUtil.java similarity index 100% rename from src/java/org/apache/poi/util/StringUtil.java rename to main/src/main/java/org/apache/poi/util/StringUtil.java diff --git a/src/java/org/apache/poi/util/SuppressForbidden.java b/main/src/main/java/org/apache/poi/util/SuppressForbidden.java similarity index 100% rename from src/java/org/apache/poi/util/SuppressForbidden.java rename to main/src/main/java/org/apache/poi/util/SuppressForbidden.java diff --git a/src/java/org/apache/poi/util/TempFile.java b/main/src/main/java/org/apache/poi/util/TempFile.java similarity index 100% rename from src/java/org/apache/poi/util/TempFile.java rename to main/src/main/java/org/apache/poi/util/TempFile.java diff --git a/src/java/org/apache/poi/util/TempFileCreationStrategy.java b/main/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java similarity index 100% rename from src/java/org/apache/poi/util/TempFileCreationStrategy.java rename to main/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java diff --git a/src/java/org/apache/poi/util/Units.java b/main/src/main/java/org/apache/poi/util/Units.java similarity index 100% rename from src/java/org/apache/poi/util/Units.java rename to main/src/main/java/org/apache/poi/util/Units.java diff --git a/src/java/org/apache/poi/util/XMLHelper.java b/main/src/main/java/org/apache/poi/util/XMLHelper.java similarity index 100% rename from src/java/org/apache/poi/util/XMLHelper.java rename to main/src/main/java/org/apache/poi/util/XMLHelper.java diff --git a/src/java/org/apache/poi/util/package-info.java b/main/src/main/java/org/apache/poi/util/package-info.java similarity index 100% rename from src/java/org/apache/poi/util/package-info.java rename to main/src/main/java/org/apache/poi/util/package-info.java diff --git a/src/java/org/apache/poi/wp/usermodel/CharacterRun.java b/main/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java similarity index 100% rename from src/java/org/apache/poi/wp/usermodel/CharacterRun.java rename to main/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java diff --git a/src/java/org/apache/poi/wp/usermodel/HeaderFooterType.java b/main/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java similarity index 100% rename from src/java/org/apache/poi/wp/usermodel/HeaderFooterType.java rename to main/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java diff --git a/src/java/org/apache/poi/wp/usermodel/Paragraph.java b/main/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java similarity index 100% rename from src/java/org/apache/poi/wp/usermodel/Paragraph.java rename to main/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java diff --git a/src/multimodule/poi/java9/module-info.class b/main/src/main/java9/module-info.class similarity index 100% rename from src/multimodule/poi/java9/module-info.class rename to main/src/main/java9/module-info.class diff --git a/src/multimodule/poi/java9/module-info.java b/main/src/main/java9/module-info.java similarity index 100% rename from src/multimodule/poi/java9/module-info.java rename to main/src/main/java9/module-info.java diff --git a/src/resources/main/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/main/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider similarity index 100% rename from src/resources/main/META-INF/services/org.apache.poi.extractor.ExtractorProvider rename to main/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider diff --git a/src/resources/main/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/main/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer similarity index 100% rename from src/resources/main/META-INF/services/org.apache.poi.sl.draw.ImageRenderer rename to main/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer diff --git a/src/resources/main/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider b/main/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider similarity index 100% rename from src/resources/main/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider rename to main/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider diff --git a/src/resources/main/font_metrics.properties b/main/src/main/resources/font_metrics.properties similarity index 100% rename from src/resources/main/font_metrics.properties rename to main/src/main/resources/font_metrics.properties diff --git a/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml b/main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml similarity index 100% rename from src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml rename to main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml diff --git a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt similarity index 100% rename from src/resources/main/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt rename to main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt diff --git a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata.txt b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt similarity index 100% rename from src/resources/main/org/apache/poi/ss/formula/function/functionMetadata.txt rename to main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt diff --git a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadataCetab.txt b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt similarity index 100% rename from src/resources/main/org/apache/poi/ss/formula/function/functionMetadataCetab.txt rename to main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt diff --git a/src/resources/version/Version.java.template b/main/src/main/version/Version.java.template similarity index 100% rename from src/resources/version/Version.java.template rename to main/src/main/version/Version.java.template diff --git a/src/testcases/org/apache/poi/POIDataSamples.java b/main/src/test/java/org/apache/poi/POIDataSamples.java similarity index 100% rename from src/testcases/org/apache/poi/POIDataSamples.java rename to main/src/test/java/org/apache/poi/POIDataSamples.java diff --git a/src/testcases/org/apache/poi/POITestCase.java b/main/src/test/java/org/apache/poi/POITestCase.java similarity index 100% rename from src/testcases/org/apache/poi/POITestCase.java rename to main/src/test/java/org/apache/poi/POITestCase.java diff --git a/src/testcases/org/apache/poi/TestJDK12.java b/main/src/test/java/org/apache/poi/TestJDK12.java similarity index 100% rename from src/testcases/org/apache/poi/TestJDK12.java rename to main/src/test/java/org/apache/poi/TestJDK12.java diff --git a/src/testcases/org/apache/poi/TestPOIDocumentMain.java b/main/src/test/java/org/apache/poi/TestPOIDocumentMain.java similarity index 100% rename from src/testcases/org/apache/poi/TestPOIDocumentMain.java rename to main/src/test/java/org/apache/poi/TestPOIDocumentMain.java diff --git a/src/testcases/org/apache/poi/TestPOITestCase.java b/main/src/test/java/org/apache/poi/TestPOITestCase.java similarity index 100% rename from src/testcases/org/apache/poi/TestPOITestCase.java rename to main/src/test/java/org/apache/poi/TestPOITestCase.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java b/main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDump.java b/main/src/test/java/org/apache/poi/ddf/TestEscherDump.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherDump.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherDump.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherProperty.java b/main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherProperty.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java b/main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java diff --git a/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java b/main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java similarity index 100% rename from src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java rename to main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java diff --git a/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java b/main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/TestVariantSupport.java rename to main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/POIFile.java b/main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/POIFile.java rename to main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestBasic.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestClassID.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestWrite.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java rename to main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java diff --git a/src/testcases/org/apache/poi/hpsf/basic/Util.java b/main/src/test/java/org/apache/poi/hpsf/basic/Util.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/basic/Util.java rename to main/src/test/java/org/apache/poi/hpsf/basic/Util.java diff --git a/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java b/main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java similarity index 100% rename from src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java rename to main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java diff --git a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java b/main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java rename to main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java diff --git a/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java b/main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java rename to main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java diff --git a/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java b/main/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java rename to main/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java b/main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java rename to main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java b/main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java rename to main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java diff --git a/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java b/main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java rename to main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java diff --git a/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java b/main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java rename to main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java diff --git a/src/testcases/org/apache/poi/hssf/dev/TestReSave.java b/main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/dev/TestReSave.java rename to main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java diff --git a/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java b/main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java rename to main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java b/main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java rename to main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java b/main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java rename to main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java rename to main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java rename to main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java rename to main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java rename to main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java rename to main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java b/main/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java rename to main/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java rename to main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java rename to main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java rename to main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java b/main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java rename to main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java rename to main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java rename to main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java rename to main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java b/main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java rename to main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java b/main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestLinkTable.java rename to main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java b/main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java rename to main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/main/src/test/java/org/apache/poi/hssf/model/TestRVA.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestRVA.java rename to main/src/test/java/org/apache/poi/hssf/model/TestRVA.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java b/main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java rename to main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/main/src/test/java/org/apache/poi/hssf/model/TestSheet.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestSheet.java rename to main/src/test/java/org/apache/poi/hssf/model/TestSheet.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java b/main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java rename to main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java b/main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestWorkbook.java rename to main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java diff --git a/src/testcases/org/apache/poi/hssf/model/TestWorkbookRecordList.java b/main/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/model/TestWorkbookRecordList.java rename to main/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java rename to main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestFontRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestNameRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestObjRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java rename to main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java rename to main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java rename to main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java b/main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java rename to main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java b/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java rename to main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestStringRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestSubRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestTableRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java b/main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java rename to main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java rename to main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java rename to main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java rename to main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java rename to main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java rename to main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java rename to main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java rename to main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java diff --git a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java b/main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java rename to main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java b/main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java rename to main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java rename to main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java b/main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java b/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java b/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java b/main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java b/main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestText.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestText.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java rename to main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java diff --git a/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java b/main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/util/TestAreaReference.java rename to main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java diff --git a/src/testcases/org/apache/poi/hssf/util/TestCellReference.java b/main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/util/TestCellReference.java rename to main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java diff --git a/src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java b/main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java rename to main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java diff --git a/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java b/main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java similarity index 100% rename from src/testcases/org/apache/poi/hssf/util/TestRKUtil.java rename to main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java diff --git a/src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java b/main/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java rename to main/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java diff --git a/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java b/main/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java rename to main/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java diff --git a/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java b/main/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java rename to main/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java diff --git a/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java b/main/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java rename to main/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java diff --git a/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java b/main/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java rename to main/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java diff --git a/src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java b/main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java rename to main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java diff --git a/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java b/main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java rename to main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java b/main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java rename to main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java diff --git a/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java b/main/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java rename to main/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java diff --git a/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java b/main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/nio/TestDataSource.java rename to main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java diff --git a/src/testcases/org/apache/poi/poifs/property/LocalProperty.java b/main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/property/LocalProperty.java rename to main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java diff --git a/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java b/main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java rename to main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java diff --git a/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java b/main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java rename to main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java diff --git a/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java b/main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java rename to main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java diff --git a/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java b/main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java rename to main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java diff --git a/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java b/main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/property/TestRootProperty.java rename to main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java diff --git a/src/testcases/org/apache/poi/poifs/storage/LocalProperty.java b/main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/storage/LocalProperty.java rename to main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java diff --git a/src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java b/main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java rename to main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java b/main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java rename to main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java diff --git a/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java b/main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java similarity index 100% rename from src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java rename to main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java diff --git a/src/testcases/org/apache/poi/sl/draw/geom/TestFormulaParser.java b/main/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java similarity index 100% rename from src/testcases/org/apache/poi/sl/draw/geom/TestFormulaParser.java rename to main/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java diff --git a/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java b/main/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java similarity index 100% rename from src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java rename to main/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java diff --git a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java b/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java similarity index 100% rename from src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java rename to main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java diff --git a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java b/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java similarity index 100% rename from src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java rename to main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java diff --git a/src/testcases/org/apache/poi/ss/ITestDataProvider.java b/main/src/test/java/org/apache/poi/ss/ITestDataProvider.java similarity index 100% rename from src/testcases/org/apache/poi/ss/ITestDataProvider.java rename to main/src/test/java/org/apache/poi/ss/ITestDataProvider.java diff --git a/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java b/main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java similarity index 100% rename from src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java rename to main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormat.java b/main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java similarity index 100% rename from src/testcases/org/apache/poi/ss/format/TestCellFormat.java rename to main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java b/main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java similarity index 100% rename from src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java rename to main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java b/main/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java similarity index 100% rename from src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java rename to main/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java diff --git a/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java b/main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java rename to main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java diff --git a/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java b/main/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java rename to main/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java diff --git a/src/testcases/org/apache/poi/ss/formula/EvaluationListener.java b/main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/EvaluationListener.java rename to main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java diff --git a/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java b/main/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java rename to main/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java diff --git a/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java b/main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java rename to main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java diff --git a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java b/main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java rename to main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java diff --git a/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java b/main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java rename to main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java diff --git a/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java b/main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java rename to main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java diff --git a/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java b/main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java rename to main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java diff --git a/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java b/main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java rename to main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java diff --git a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java rename to main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java diff --git a/src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java b/main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java rename to main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java b/main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java rename to main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java b/main/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java b/main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestPowerEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestPowerEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java diff --git a/src/testcases/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java b/main/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java rename to main/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java diff --git a/src/testcases/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java b/main/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java rename to main/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java diff --git a/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java b/main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java rename to main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java b/main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java rename to main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java rename to main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java rename to main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java b/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java b/main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java b/main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/RefEvalImplementation.java b/main/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/RefEvalImplementation.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestClean.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestCode.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDate.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestFind.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestLen.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestMid.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestNper.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestRank.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestText.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestText.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestTime.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestValue.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java rename to main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/BaseTestPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/BaseTestPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java rename to main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java diff --git a/src/testcases/org/apache/poi/ss/formula/udf/TestUDFFinder.java b/main/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java similarity index 100% rename from src/testcases/org/apache/poi/ss/formula/udf/TestUDFFinder.java rename to main/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java rename to main/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java rename to main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java rename to main/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java rename to main/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java rename to main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java rename to main/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java similarity index 100% rename from src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java rename to main/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java diff --git a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java b/main/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java rename to main/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java diff --git a/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java b/main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java rename to main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java diff --git a/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java b/main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java rename to main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java diff --git a/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java b/main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java rename to main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java diff --git a/src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java b/main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java rename to main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java diff --git a/src/testcases/org/apache/poi/ss/util/TestAreaReference.java b/main/src/test/java/org/apache/poi/ss/util/TestAreaReference.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestAreaReference.java rename to main/src/test/java/org/apache/poi/ss/util/TestAreaReference.java diff --git a/src/testcases/org/apache/poi/ss/util/TestCellAddress.java b/main/src/test/java/org/apache/poi/ss/util/TestCellAddress.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestCellAddress.java rename to main/src/test/java/org/apache/poi/ss/util/TestCellAddress.java diff --git a/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java b/main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java rename to main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java diff --git a/src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java rename to main/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java diff --git a/src/testcases/org/apache/poi/ss/util/TestCellReference.java b/main/src/test/java/org/apache/poi/ss/util/TestCellReference.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestCellReference.java rename to main/src/test/java/org/apache/poi/ss/util/TestCellReference.java diff --git a/src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java b/main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java rename to main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java diff --git a/src/testcases/org/apache/poi/ss/util/TestDateParser.java b/main/src/test/java/org/apache/poi/ss/util/TestDateParser.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestDateParser.java rename to main/src/test/java/org/apache/poi/ss/util/TestDateParser.java diff --git a/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java b/main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java rename to main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java diff --git a/src/testcases/org/apache/poi/ss/util/TestHSSFCellUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestHSSFCellUtil.java rename to main/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java diff --git a/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java b/main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestNumberComparer.java rename to main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java diff --git a/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java b/main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java rename to main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java diff --git a/src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java b/main/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java rename to main/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java diff --git a/src/testcases/org/apache/poi/ss/util/TestRegionUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestRegionUtil.java rename to main/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java diff --git a/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java b/main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java rename to main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java diff --git a/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestSheetUtil.java rename to main/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java diff --git a/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java rename to main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java diff --git a/src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java b/main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java similarity index 100% rename from src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java rename to main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java diff --git a/src/testcases/org/apache/poi/util/MemoryLeakVerifier.java b/main/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java similarity index 100% rename from src/testcases/org/apache/poi/util/MemoryLeakVerifier.java rename to main/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java diff --git a/src/testcases/org/apache/poi/util/NullOutputStream.java b/main/src/test/java/org/apache/poi/util/NullOutputStream.java similarity index 100% rename from src/testcases/org/apache/poi/util/NullOutputStream.java rename to main/src/test/java/org/apache/poi/util/NullOutputStream.java diff --git a/src/testcases/org/apache/poi/util/NullPrintStream.java b/main/src/test/java/org/apache/poi/util/NullPrintStream.java similarity index 100% rename from src/testcases/org/apache/poi/util/NullPrintStream.java rename to main/src/test/java/org/apache/poi/util/NullPrintStream.java diff --git a/src/testcases/org/apache/poi/util/TestArrayUtil.java b/main/src/test/java/org/apache/poi/util/TestArrayUtil.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestArrayUtil.java rename to main/src/test/java/org/apache/poi/util/TestArrayUtil.java diff --git a/src/testcases/org/apache/poi/util/TestBitField.java b/main/src/test/java/org/apache/poi/util/TestBitField.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestBitField.java rename to main/src/test/java/org/apache/poi/util/TestBitField.java diff --git a/src/testcases/org/apache/poi/util/TestByteField.java b/main/src/test/java/org/apache/poi/util/TestByteField.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestByteField.java rename to main/src/test/java/org/apache/poi/util/TestByteField.java diff --git a/src/testcases/org/apache/poi/util/TestHexDump.java b/main/src/test/java/org/apache/poi/util/TestHexDump.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestHexDump.java rename to main/src/test/java/org/apache/poi/util/TestHexDump.java diff --git a/src/testcases/org/apache/poi/util/TestIOUtils.java b/main/src/test/java/org/apache/poi/util/TestIOUtils.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestIOUtils.java rename to main/src/test/java/org/apache/poi/util/TestIOUtils.java diff --git a/src/testcases/org/apache/poi/util/TestIntList.java b/main/src/test/java/org/apache/poi/util/TestIntList.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestIntList.java rename to main/src/test/java/org/apache/poi/util/TestIntList.java diff --git a/src/testcases/org/apache/poi/util/TestIntegerField.java b/main/src/test/java/org/apache/poi/util/TestIntegerField.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestIntegerField.java rename to main/src/test/java/org/apache/poi/util/TestIntegerField.java diff --git a/src/testcases/org/apache/poi/util/TestLittleEndian.java b/main/src/test/java/org/apache/poi/util/TestLittleEndian.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestLittleEndian.java rename to main/src/test/java/org/apache/poi/util/TestLittleEndian.java diff --git a/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java b/main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestLittleEndianStreams.java rename to main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java diff --git a/src/testcases/org/apache/poi/util/TestLocaleUtil.java b/main/src/test/java/org/apache/poi/util/TestLocaleUtil.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestLocaleUtil.java rename to main/src/test/java/org/apache/poi/util/TestLocaleUtil.java diff --git a/src/testcases/org/apache/poi/util/TestLongField.java b/main/src/test/java/org/apache/poi/util/TestLongField.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestLongField.java rename to main/src/test/java/org/apache/poi/util/TestLongField.java diff --git a/src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java b/main/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java rename to main/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java diff --git a/src/testcases/org/apache/poi/util/TestShortField.java b/main/src/test/java/org/apache/poi/util/TestShortField.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestShortField.java rename to main/src/test/java/org/apache/poi/util/TestShortField.java diff --git a/src/testcases/org/apache/poi/util/TestStringCodepointsIterable.java b/main/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestStringCodepointsIterable.java rename to main/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java diff --git a/src/testcases/org/apache/poi/util/TestStringUtil.java b/main/src/test/java/org/apache/poi/util/TestStringUtil.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestStringUtil.java rename to main/src/test/java/org/apache/poi/util/TestStringUtil.java diff --git a/src/testcases/org/apache/poi/util/TestTempFile.java b/main/src/test/java/org/apache/poi/util/TestTempFile.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestTempFile.java rename to main/src/test/java/org/apache/poi/util/TestTempFile.java diff --git a/src/testcases/org/apache/poi/util/TestXMLHelper.java b/main/src/test/java/org/apache/poi/util/TestXMLHelper.java similarity index 100% rename from src/testcases/org/apache/poi/util/TestXMLHelper.java rename to main/src/test/java/org/apache/poi/util/TestXMLHelper.java diff --git a/src/testcases/org/apache/poi/util/data/test_properties1 b/main/src/test/java/org/apache/poi/util/data/test_properties1 similarity index 100% rename from src/testcases/org/apache/poi/util/data/test_properties1 rename to main/src/test/java/org/apache/poi/util/data/test_properties1 diff --git a/src/testcases/org/apache/poi/util/data/test_properties2 b/main/src/test/java/org/apache/poi/util/data/test_properties2 similarity index 100% rename from src/testcases/org/apache/poi/util/data/test_properties2 rename to main/src/test/java/org/apache/poi/util/data/test_properties2 diff --git a/src/testcases/org/apache/poi/util/data/test_properties3 b/main/src/test/java/org/apache/poi/util/data/test_properties3 similarity index 100% rename from src/testcases/org/apache/poi/util/data/test_properties3 rename to main/src/test/java/org/apache/poi/util/data/test_properties3 diff --git a/src/multimodule/poi/test9/module-info.class b/main/src/test/java9/module-info.class similarity index 100% rename from src/multimodule/poi/test9/module-info.class rename to main/src/test/java9/module-info.class diff --git a/src/multimodule/poi/test9/module-info.java b/main/src/test/java9/module-info.java similarity index 100% rename from src/multimodule/poi/test9/module-info.java rename to main/src/test/java9/module-info.java diff --git a/src/resources/test/log4j2-test.xml b/main/src/test/resources/log4j2-test.xml similarity index 100% rename from src/resources/test/log4j2-test.xml rename to main/src/test/resources/log4j2-test.xml diff --git a/ooxml-schema/build.gradle b/ooxml-schema/build.gradle new file mode 100644 index 0000000000..68aa790fcf --- /dev/null +++ b/ooxml-schema/build.gradle @@ -0,0 +1,70 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + +apply plugin: 'java' + +configurations { + antdep +} + +dependencies { + antdep 'org.apache.ant:ant:1.10.9' +} + +/*task downloadJarsToLibs() { + def f = new File("$projectDir/../lib/ooxml/xmlbeans-5.0.0.jar") + if (!f.exists()) { + println 'writing file ' + f.getAbsolutePath() + f.getParentFile().mkdirs() + new URL('https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-5.0.0.jar').withInputStream{ i -> f.withOutputStream{ it << i }} + } +}*/ + +// we need to ensure that the custom ant tasks are compiled before we import the build.xml file + +task compileContrib (type: JavaCompile) { + source = "../excelant/src/poi-ant-contrib/java" + include '*.java' + exclude 'Junit5Progress.java' + classpath = configurations.antdep + destinationDirectory = file('../excelant/build/poi-ant-contrib') +} + + +// for now import the ant-task for building the jars from build.xml +// we need to rename the tasks as e.g. task "jar" conflicts with :ooxml:jar + +ant.importBuild('../build.xml') { antTargetName -> + 'ant-' + antTargetName +} + +compileJava.dependsOn 'compileContrib' +compileJava.dependsOn 'ant-compile-ooxml-xsds' + +//compileJava.dependsOn 'downloadJarsToLibs' + +dependencies { + api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}" +} + +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml.schemas' + } +} + +japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig similarity index 100% rename from src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig rename to ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig similarity index 100% rename from src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig rename to ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig similarity index 100% rename from src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig rename to ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd diff --git a/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip diff --git a/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip diff --git a/src/ooxml/resources/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip diff --git a/src/ooxml/resources/org/apache/poi/schemas/XAdES.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/XAdES.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd diff --git a/src/ooxml/resources/org/apache/poi/schemas/XAdESv141.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/XAdESv141.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd diff --git a/src/ooxml/resources/org/apache/poi/schemas/markup-compatibility.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/markup-compatibility.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd diff --git a/src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig diff --git a/src/ooxml/resources/org/apache/poi/schemas/vmlDrawing.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/vmlDrawing.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd diff --git a/src/ooxml/resources/org/apache/poi/schemas/xmldsig-core-schema.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/schemas/xmldsig-core-schema.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd diff --git a/src/ooxml/resources/org/apache/poi/xdgf/visio.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd similarity index 100% rename from src/ooxml/resources/org/apache/poi/xdgf/visio.xsd rename to ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd diff --git a/src/multimodule/ooxml-full/java9/module-info.class b/ooxml-schema/src/ooxml-full/java9/module-info.class similarity index 100% rename from src/multimodule/ooxml-full/java9/module-info.class rename to ooxml-schema/src/ooxml-full/java9/module-info.class diff --git a/src/multimodule/ooxml-full/java9/module-info.java b/ooxml-schema/src/ooxml-full/java9/module-info.java similarity index 100% rename from src/multimodule/ooxml-full/java9/module-info.java rename to ooxml-schema/src/ooxml-full/java9/module-info.java diff --git a/ooxml-schema/src/ooxml-lite/java9/module-info.class b/ooxml-schema/src/ooxml-lite/java9/module-info.class new file mode 100644 index 0000000000..5a1a8d9258 Binary files /dev/null and b/ooxml-schema/src/ooxml-lite/java9/module-info.class differ diff --git a/src/multimodule/ooxml-lite/java9/module-info.java b/ooxml-schema/src/ooxml-lite/java9/module-info.java similarity index 98% rename from src/multimodule/ooxml-lite/java9/module-info.java rename to ooxml-schema/src/ooxml-lite/java9/module-info.java index f8e193e41e..2559d369d8 100644 --- a/src/multimodule/ooxml-lite/java9/module-info.java +++ b/ooxml-schema/src/ooxml-lite/java9/module-info.java @@ -29,7 +29,6 @@ open module org.apache.poi.ooxml.schemas { exports com.microsoft.schemas.office.excel; exports com.microsoft.schemas.office.office; exports com.microsoft.schemas.office.visio.x2012.main; - exports com.microsoft.schemas.office.word; exports com.microsoft.schemas.office.x2006.digsig; exports com.microsoft.schemas.vml; exports org.apache.poi.schemas.ooxml.system.ooxml; diff --git a/ooxml/build.gradle b/ooxml/build.gradle new file mode 100644 index 0000000000..58ff2a4d1e --- /dev/null +++ b/ooxml/build.gradle @@ -0,0 +1,58 @@ +/* ==================================================================== + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +==================================================================== */ + +dependencies { + api project(":ooxml-schema") + implementation 'org.apache.commons:commons-collections4:4.4' + api "org.apache.commons:commons-compress:${commonsCompressVersion}" + api 'org.apache.santuario:xmlsec:2.2.1' + api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}" + api 'com.github.virtuald:curvesapi:1.06' + implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" + + api "org.apache.xmlgraphics:batik-svggen:${batikVersion}" + implementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") { + exclude group: 'org.apache.xmlgraphics', module: 'batik-script' + } + implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}" + + api 'de.rototor.pdfbox:graphics2d:0.30' + + api project(':main') + api files("../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar") + + testRuntime project(':scratchpad') + testImplementation 'org.xmlunit:xmlunit-core:2.8.0' + testImplementation 'org.reflections:reflections:0.9.12' + testImplementation project(path: ':main', configuration: 'tests') + testImplementation 'org.openjdk.jmh:jmh-core:1.26' + testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26' + testImplementation 'com.google.guava:guava:30.0-jre' +} + +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml' + } +} + +japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" + +test { + // for some reason catching the OOM does not work when run from Gradle + exclude '**/MemoryUsage.class' +} \ No newline at end of file diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java rename to ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java rename to ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLException.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/POIXMLException.java rename to ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLFactory.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/POIXMLFactory.java rename to ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLProperties.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/POIXMLProperties.java rename to ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLRelation.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/POIXMLRelation.java rename to ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLTypeLoader.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/POIXMLTypeLoader.java rename to ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLLister.java b/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLLister.java rename to ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java b/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java rename to ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java rename to ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java rename to ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java rename to ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java rename to ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java rename to ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/IdentifierManager.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/util/IdentifierManager.java rename to ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/POIXMLUnits.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/util/POIXMLUnits.java rename to ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/PackageHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/util/PackageHelper.java rename to ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java rename to ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java rename to ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java rename to ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageProperties.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackageProperties.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/RelationshipSource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/RelationshipSource.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/TargetMode.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/TargetMode.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java similarity index 100% rename from src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java rename to ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java rename to ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/Angles.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/Angles.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/CompoundLine.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/CompoundLine.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineCap.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/LineCap.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndLength.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndLength.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndWidth.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndWidth.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PathShadeType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/PathShadeType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PenAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/PenAlignment.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/PresetColor.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetGeometry.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/PresetGeometry.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetLineDash.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/PresetLineDash.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetPattern.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/PresetPattern.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/SchemeColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/SchemeColor.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/SystemColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/SystemColor.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/TileFlipMode.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/TileFlipMode.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColor.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPath.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPath.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPicture.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPicture.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Grouping.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Grouping.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Shape.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Shape.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AnchorType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/AnchorType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/CapsType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/CapsType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/StrikeType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/StrikeType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextContainer.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextContainer.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java rename to ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java b/ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java rename to ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java b/ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java rename to ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java b/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java rename to ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java b/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java rename to ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFText.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFText.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java rename to ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java b/ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java rename to ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/util/Util.java b/ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/util/Util.java rename to ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java b/ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java rename to ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java diff --git a/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java b/ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java rename to ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java diff --git a/src/ooxml/java/org/apache/poi/xslf/draw/SVGImageRenderer.java b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/draw/SVGImageRenderer.java rename to ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java diff --git a/src/ooxml/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java rename to ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java diff --git a/src/ooxml/java/org/apache/poi/xslf/draw/SVGRenderExtension.java b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/draw/SVGRenderExtension.java rename to ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java diff --git a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFExtractor.java b/ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/extractor/XSLFExtractor.java rename to ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java diff --git a/src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java rename to ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java diff --git a/src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java rename to ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java diff --git a/src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java rename to ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java diff --git a/src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java rename to ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComment.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComment.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFactory.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFactory.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontData.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontData.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java rename to ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/BitmapFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/BitmapFormat.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/DummyFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/DummyFormat.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java b/ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/EMFHandler.java b/ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/EMFHandler.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/MFProxy.java b/ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/MFProxy.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/OutputFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/OutputFormat.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PDFFontMapper.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/PDFFontMapper.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PDFFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/PDFFormat.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTHandler.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/PPTHandler.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/SVGFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/SVGFormat.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java diff --git a/src/ooxml/java/org/apache/poi/xslf/util/WMFHandler.java b/ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xslf/util/WMFHandler.java rename to ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java diff --git a/src/ooxml/java/org/apache/poi/xssf/XLSBUnsupportedException.java b/ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/XLSBUnsupportedException.java rename to ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBComment.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBComment.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParseException.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParseException.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParser.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParser.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRelation.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRelation.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichStr.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichStr.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBUtils.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFBUtils.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/package-info.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/binary/package-info.java rename to ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java rename to ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java rename to ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java rename to ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java rename to ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java rename to ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java rename to ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java rename to ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java rename to ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java b/ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/Comments.java b/ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/Comments.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java b/ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SharedStrings.java b/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/SharedStrings.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java b/ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/Styles.java b/ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/Styles.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/Themes.java b/ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/Themes.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java diff --git a/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/OpcOutputStream.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/OpcOutputStream.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/Zip64Impl.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/streaming/Zip64Impl.java rename to ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAlign.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/TextAlign.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAutofit.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/TextAutofit.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextCap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/TextCap.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextDirection.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/TextDirection.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextFontAlign.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/TextFontAlign.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShape.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShape.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java rename to ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java diff --git a/src/ooxml/java/org/apache/poi/xssf/util/CTColComparator.java b/ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/util/CTColComparator.java rename to ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java diff --git a/src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java b/ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java rename to ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java b/ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java rename to ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java rename to ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java rename to ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java rename to ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/package-info.java b/ooxml/src/main/java/org/apache/poi/xwpf/package-info.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/package-info.java rename to ooxml/src/main/java/org/apache/poi/xwpf/package-info.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyType.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/Borders.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/Borders.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBodyElement.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/IBodyElement.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ICell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/ICell.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunElement.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunElement.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContent.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContent.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TOC.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/TOC.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableWidthType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/TableWidthType.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegment.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFChart.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFChart.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComments.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComments.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java similarity index 100% rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java rename to ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java diff --git a/src/multimodule/ooxml/java9/module-info.class b/ooxml/src/main/java9/module-info.class similarity index 100% rename from src/multimodule/ooxml/java9/module-info.class rename to ooxml/src/main/java9/module-info.class diff --git a/src/multimodule/ooxml/java9/module-info.java b/ooxml/src/main/java9/module-info.java similarity index 100% rename from src/multimodule/ooxml/java9/module-info.java rename to ooxml/src/main/java9/module-info.java diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider similarity index 100% rename from src/resources/ooxml/META-INF/services/org.apache.poi.extractor.ExtractorProvider rename to ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer similarity index 100% rename from src/resources/ooxml/META-INF/services/org.apache.poi.sl.draw.ImageRenderer rename to ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider b/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider similarity index 100% rename from src/resources/ooxml/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider rename to ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider b/ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider similarity index 100% rename from src/resources/ooxml/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider rename to ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider diff --git a/src/resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx b/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx similarity index 100% rename from src/resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx rename to ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx diff --git a/src/resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml b/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml similarity index 100% rename from src/resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml rename to ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml diff --git a/src/resources/ooxml/org/apache/poi/xssf/usermodel/presetTableStyles.xml b/ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml similarity index 100% rename from src/resources/ooxml/org/apache/poi/xssf/usermodel/presetTableStyles.xml rename to ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml diff --git a/src/multimodule/ooxml-lite-agent/java9/module-info.class b/ooxml/src/ooxml-lite-agent/java9/module-info.class similarity index 100% rename from src/multimodule/ooxml-lite-agent/java9/module-info.class rename to ooxml/src/ooxml-lite-agent/java9/module-info.class diff --git a/src/multimodule/ooxml-lite-agent/java9/module-info.java b/ooxml/src/ooxml-lite-agent/java9/module-info.java similarity index 100% rename from src/multimodule/ooxml-lite-agent/java9/module-info.java rename to ooxml/src/ooxml-lite-agent/java9/module-info.java diff --git a/src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java b/ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java rename to ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java diff --git a/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java b/ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java rename to ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java rename to ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java rename to ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java rename to ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java rename to ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLProperties.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLProperties.java rename to ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java rename to ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java rename to ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java b/ooxml/src/test/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java rename to ooxml/src/test/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java b/ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java rename to ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java rename to ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/SLCommonUtils.java b/ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/sl/tests/SLCommonUtils.java rename to ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java rename to ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java rename to ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java rename to ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java rename to ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java rename to ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java b/ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java rename to ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java b/ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java b/ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java b/ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestCountifs.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestCountifs.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestProper.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestProper.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java rename to ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java diff --git a/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java b/ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java rename to ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java diff --git a/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java b/ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java rename to ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java rename to ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java diff --git a/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java b/ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java rename to ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java b/ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java rename to ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java rename to ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java b/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java rename to ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java b/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java rename to ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java rename to ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java b/ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java rename to ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java rename to ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java b/ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java rename to ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java b/ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java rename to ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java rename to ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java b/ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java rename to ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java b/ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java rename to ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFMemoryLeak.java b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/TestXSSFMemoryLeak.java rename to ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java rename to ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java b/ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java rename to ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java rename to ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java b/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java rename to ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java rename to ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java rename to ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java rename to ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java rename to ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java rename to ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java rename to ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java rename to ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java rename to ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java rename to ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java rename to ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java rename to ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java rename to ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java rename to ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java rename to ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFShape.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFShape.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java rename to ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java b/ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java rename to ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java b/ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java rename to ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java b/ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java rename to ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java b/ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java rename to ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java rename to ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java rename to ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java rename to ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java rename to ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java rename to ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java rename to ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java b/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java rename to ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java rename to ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java b/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java rename to ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java b/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java rename to ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComments.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComments.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java similarity index 100% rename from src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java rename to ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java diff --git a/src/multimodule/ooxml/test9/module-info.class b/ooxml/src/test/java9/module-info.class similarity index 100% rename from src/multimodule/ooxml/test9/module-info.class rename to ooxml/src/test/java9/module-info.class diff --git a/src/multimodule/ooxml/test9/module-info.java b/ooxml/src/test/java9/module-info.java similarity index 100% rename from src/multimodule/ooxml/test9/module-info.java rename to ooxml/src/test/java9/module-info.java diff --git a/src/records/definitions/series_list_record.xml b/scratchpad/build.gradle similarity index 55% rename from src/records/definitions/series_list_record.xml rename to scratchpad/build.gradle index 88eeb67046..9b0717e37a 100644 --- a/src/records/definitions/series_list_record.xml +++ b/scratchpad/build.gradle @@ -1,6 +1,4 @@ - - - - Record - Record - The series list record defines the series displayed as an overlay to the main chart record. - Glen Stampoultzis (glens at apache.org) - - - - +==================================================================== */ + +dependencies { + api project(':main') + implementation "commons-codec:commons-codec:${commonsCodecVersion}" + implementation "org.apache.commons:commons-math3:${commonsMathVersion}" + implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}" + + testImplementation project(path: ':main', configuration: 'tests') +} + +jar { + manifest { + attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad' + } +} + +japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar" \ No newline at end of file diff --git a/src/scratchpad/models/poi-hdf.zargo b/scratchpad/models/poi-hdf.zargo similarity index 100% rename from src/scratchpad/models/poi-hdf.zargo rename to scratchpad/models/poi-hdf.zargo diff --git a/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java b/scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java rename to scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java b/scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java b/scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java rename to scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfDrawProperties.java b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/draw/HemfDrawProperties.java rename to scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfGraphics.java b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/draw/HemfGraphics.java rename to scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfImageRenderer.java b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/draw/HemfImageRenderer.java rename to scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfHeader.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfHeader.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfMisc.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfMisc.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPalette.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPalette.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPenStyle.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPenStyle.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecord.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordIterator.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordIterator.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordType.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordType.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfText.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfText.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfWindowing.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfWindowing.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java rename to scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java b/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java rename to scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java diff --git a/src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfPicture.java b/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfPicture.java rename to scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/Attachment.java b/scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/Attachment.java rename to scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java b/scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java rename to scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java b/scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java rename to scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java rename to scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java b/scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java rename to scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java diff --git a/src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java b/scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java rename to scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java b/scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java b/scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java b/scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java rename to scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java rename to scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java rename to scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java rename to scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java rename to scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java rename to scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java b/scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java rename to scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java rename to scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java rename to scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CString.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/CString.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Document.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Document.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Environment.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Environment.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjRefAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExObjRefAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontEmbeddedData.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/FontEmbeddedData.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Notes.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Record.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Slide.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtomLayout.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SlideAtomLayout.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/Sound.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoAtom.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFComment.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFComment.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfo.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfo.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFLine.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFLine.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java rename to scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java diff --git a/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java b/scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java rename to scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java b/scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java b/scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java b/scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java b/scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java diff --git a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java rename to scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java rename to scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java rename to scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java rename to scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java rename to scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java rename to scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphicsState.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphicsState.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfImageRenderer.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfImageRenderer.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP2Composite.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP2Composite.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP3Composite.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP3Composite.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBrushStyle.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBrushStyle.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMapMode.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMapMode.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecord.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecord.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecordType.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecordType.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRegionMode.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRegionMode.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java rename to scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java b/scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java b/scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldComplexFileTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldComplexFileTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPiece.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPiece.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/util/DoubleByteUtil.java b/scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/util/DoubleByteUtil.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java diff --git a/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java b/scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java similarity index 100% rename from src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java rename to scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java diff --git a/src/multimodule/scratchpad/java9/module-info.class b/scratchpad/src/main/java9/module-info.class similarity index 100% rename from src/multimodule/scratchpad/java9/module-info.class rename to scratchpad/src/main/java9/module-info.class diff --git a/src/multimodule/scratchpad/java9/module-info.java b/scratchpad/src/main/java9/module-info.java similarity index 100% rename from src/multimodule/scratchpad/java9/module-info.java rename to scratchpad/src/main/java9/module-info.java diff --git a/src/resources/scratchpad/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider similarity index 100% rename from src/resources/scratchpad/META-INF/services/org.apache.poi.extractor.ExtractorProvider rename to scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider diff --git a/src/resources/scratchpad/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer similarity index 100% rename from src/resources/scratchpad/META-INF/services/org.apache.poi.sl.draw.ImageRenderer rename to scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer diff --git a/src/resources/scratchpad/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider similarity index 100% rename from src/resources/scratchpad/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider rename to scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider diff --git a/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl b/scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl similarity index 100% rename from src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl rename to scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl diff --git a/src/resources/scratchpad/org/apache/poi/hslf/data/empty.ppt b/scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt similarity index 100% rename from src/resources/scratchpad/org/apache/poi/hslf/data/empty.ppt rename to scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java b/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java b/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java b/scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java b/scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java b/scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java b/scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java rename to scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java diff --git a/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java b/scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java b/scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java rename to scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java rename to scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java rename to scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java rename to scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java rename to scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java b/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java rename to scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java b/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java rename to scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/dev/TestHMEFDumper.java b/scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/dev/TestHMEFDumper.java rename to scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java b/scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java b/scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java rename to scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java b/scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java b/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java rename to scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java b/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java rename to scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java b/scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java rename to scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java rename to scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestPOIDocumentScratchpad.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/TestPOIDocumentScratchpad.java rename to scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java rename to scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java rename to scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java rename to scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/BaseTestPPTIterating.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/BaseTestPPTIterating.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPTXMLDump.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPTXMLDump.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTTextListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTTextListing.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideIdListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideIdListing.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowDumper.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowDumper.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestTextStyleListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestTextStyleListing.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java rename to scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java b/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java rename to scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java rename to scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java rename to scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java b/scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java rename to scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java b/scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java b/scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java b/scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java rename to scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java b/scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java rename to scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java b/scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java rename to scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java b/scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java rename to scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java b/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java b/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java b/scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlfLfo.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlfLfo.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java b/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java b/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java b/scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java similarity index 100% rename from src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java rename to scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java diff --git a/src/multimodule/scratchpad/test9/module-info.class b/scratchpad/src/test/java9/module-info.class similarity index 100% rename from src/multimodule/scratchpad/test9/module-info.class rename to scratchpad/src/test/java9/module-info.class diff --git a/src/multimodule/scratchpad/test9/module-info.java b/scratchpad/src/test/java9/module-info.java similarity index 100% rename from src/multimodule/scratchpad/test9/module-info.java rename to scratchpad/src/test/java9/module-info.java diff --git a/settings.gradle b/settings.gradle index de9c7e7cb8..c1b5e71952 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,3 @@ rootProject.name = 'poi' -include 'main', 'ooxml', 'excelant', 'examples', 'scratchpad', 'integrationtest' - -project(':main').projectDir = new File(settingsDir, 'build/main') -project(':ooxml').projectDir = new File(settingsDir, 'build/ooxml') -project(':excelant').projectDir = new File(settingsDir, 'build/excelant') -project(':examples').projectDir = new File(settingsDir, 'build/examples') -project(':scratchpad').projectDir = new File(settingsDir, 'build/scratchpad') -project(':integrationtest').projectDir = new File(settingsDir, 'build/integrationtest') +include 'main', 'ooxml-schema', 'ooxml', 'excelant', 'examples', 'scratchpad', 'integrationtest' \ No newline at end of file diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml index 3c28c7989b..7dceeabfa2 100644 --- a/sonar/excelant/pom.xml +++ b/sonar/excelant/pom.xml @@ -31,7 +31,7 @@ ${basedir}/src/main/java - ../../src/excelant/java + ../../excelant/src/main/java @@ -47,10 +47,10 @@ ${basedir}/src/main/resources - ../../src/excelant/resources + ../../excelant/src/main/resources - ../../src/resources/test + ../../excelant/src/test/resources @@ -66,7 +66,7 @@ ${basedir}/src/test/java - ../../src/excelant/testcases + ../../excelant/src/test/java diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml index d1baa067e4..01e75d9b9b 100644 --- a/sonar/integration-test/pom.xml +++ b/sonar/integration-test/pom.xml @@ -7,6 +7,7 @@ org.apache.poi poi-parent 5.0.1-SNAPSHOT + integration-test jar @@ -18,7 +19,7 @@ maven-resources-plugin - + ${maven.plugin.resources.version} copy-tests @@ -30,10 +31,10 @@ ${basedir}/src/test/java - ../../src/integrationtest + ../../integrationtest/src/test/java - ../../src/testcases + ../../main/src/test/java org/apache/poi/POIDataSamples.java org/apache/poi/util/NullPrintStream.java @@ -42,7 +43,7 @@ - ../../src/resources/integrationtest + ../../integrationtest/src/test/resources diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml index 0d99970519..3383554035 100644 --- a/sonar/main/pom.xml +++ b/sonar/main/pom.xml @@ -30,7 +30,7 @@ ${basedir}/src/main/java - ../../src/java + ../../main/src/main/java @@ -45,7 +45,7 @@ ${basedir}/src/main/resources - ../../src/resources/main + ../../main/src/main/resources @@ -61,10 +61,10 @@ ${basedir}/src/test/java - ../../src/testcases + ../../main/src/test/java - ../../src/resources/test + ../../main/src/test/resources diff --git a/sonar/ooxml-full/pom.xml b/sonar/ooxml-full/pom.xml index 09b111f0ed..263136d962 100644 --- a/sonar/ooxml-full/pom.xml +++ b/sonar/ooxml-full/pom.xml @@ -34,7 +34,7 @@ - + @@ -80,11 +80,6 @@ ${basedir}/target/generated-sources ${basedir}/target/schemas - - - ${basedir}/../../lib/ooxml/xmlbeans-4.0.0.jar - - @@ -105,7 +100,7 @@ ${basedir}/target/generated-resources - ${basedir}/../../src/multimodule/ooxml-full/java9 + ${basedir}/../../ooxml-schema/src/ooxml-full/java9 META-INF/versions/9 *.class diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml index dc9a77b415..e181ca3171 100644 --- a/sonar/ooxml/pom.xml +++ b/sonar/ooxml/pom.xml @@ -28,7 +28,7 @@ ${basedir}/src/main/java - ../../src/ooxml/java + ../../ooxml/src/main/java @@ -43,7 +43,7 @@ ${basedir}/src/main/resources - ../../src/resources/ooxml + ../../ooxml/src/main/resources @@ -58,10 +58,10 @@ ${basedir}/src/test/java - ../../src/ooxml/testcases + ../../ooxml/src/test/java - ../../src/resources/test + ../../ooxml/src/test/resources diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml index c79dc66f81..639d930358 100644 --- a/sonar/scratchpad/pom.xml +++ b/sonar/scratchpad/pom.xml @@ -17,7 +17,7 @@ src/main/java/org/apache/poi/hwpf/model/types/*,src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/* - + @@ -37,7 +37,7 @@ ${basedir}/src/main/java - ../../src/scratchpad/src + ../../scratchpad/src/main/java @@ -53,7 +53,7 @@ ${basedir}/src/main/resources - ../../src/resources/scratchpad + ../../scratchpad/src/main/resources @@ -69,10 +69,10 @@ ${basedir}/src/test/java - ../../src/scratchpad/testcases + ../../scratchpad/src/test/java - ../../src/resources/test + ../../scratchpad/src/test/resources @@ -91,7 +91,7 @@ - + diff --git a/src/contrib/testcases/dummy.txt b/src/contrib/testcases/dummy.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/examples/lib/dummy.txt b/src/examples/lib/dummy.txt deleted file mode 100644 index ee37f45196..0000000000 --- a/src/examples/lib/dummy.txt +++ /dev/null @@ -1 +0,0 @@ -Dummy file so this directory is not deleted by CVS. It's required for the build. \ No newline at end of file diff --git a/src/multimodule/ooxml-lite/java9/module-info.class b/src/multimodule/ooxml-lite/java9/module-info.class deleted file mode 100644 index 6c12f9f957..0000000000 Binary files a/src/multimodule/ooxml-lite/java9/module-info.class and /dev/null differ diff --git a/src/records/definitions/area_format_record.xml b/src/records/definitions/area_format_record.xml deleted file mode 100644 index 3fc2a9c189..0000000000 --- a/src/records/definitions/area_format_record.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Record - Record - The area format record is used to define the colours and patterns for an area. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - diff --git a/src/records/definitions/area_record.xml b/src/records/definitions/area_record.xml deleted file mode 100644 index 16f04e15f2..0000000000 --- a/src/records/definitions/area_record.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - Record - Record - The area record is used to define a area chart. - Glen Stampoultzis (glens at apache.org) - - - - - - - - diff --git a/src/records/definitions/attached_label_record.xml b/src/records/definitions/attached_label_record.xml deleted file mode 100644 index e2e59e8e8b..0000000000 --- a/src/records/definitions/attached_label_record.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Record - Record - The series label record defines the type of label associated with the data format record. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - diff --git a/src/records/definitions/axes_used_record.xml b/src/records/definitions/axes_used_record.xml deleted file mode 100644 index cd8cf1065f..0000000000 --- a/src/records/definitions/axes_used_record.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Record - Record - The number of axes used on a chart. - Glen Stampoultzis (glens at apache.org) - - - - diff --git a/src/records/definitions/axis_line_format_record.xml b/src/records/definitions/axis_line_format_record.xml deleted file mode 100644 index ff0fc4d392..0000000000 --- a/src/records/definitions/axis_line_format_record.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - Record - Record - The axis line format record defines the axis type details. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - diff --git a/src/records/definitions/axis_options_record.xml b/src/records/definitions/axis_options_record.xml deleted file mode 100644 index 0100f6e1a1..0000000000 --- a/src/records/definitions/axis_options_record.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - Record - Record - The axis options record provides unit information and other various tidbits about the axis. - Andrew C. Oliver(acoliver at apache.org) - - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/axis_parent_record.xml b/src/records/definitions/axis_parent_record.xml deleted file mode 100644 index 22532a81cd..0000000000 --- a/src/records/definitions/axis_parent_record.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Record - Record - The axis size and location - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - diff --git a/src/records/definitions/axis_record.xml b/src/records/definitions/axis_record.xml deleted file mode 100644 index b03c23f777..0000000000 --- a/src/records/definitions/axis_record.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Record - Record - The axis record defines the type of an axis. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - diff --git a/src/records/definitions/bar_record.xml b/src/records/definitions/bar_record.xml deleted file mode 100644 index 9fffd79fa7..0000000000 --- a/src/records/definitions/bar_record.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Record - Record - The bar record is used to define a bar chart. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - diff --git a/src/records/definitions/category_series_axis_record.xml b/src/records/definitions/category_series_axis_record.xml deleted file mode 100644 index 94088b5a79..0000000000 --- a/src/records/definitions/category_series_axis_record.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Record - Record - This record refers to a category or series axis and is used to specify label/tickmark frequency. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - diff --git a/src/records/definitions/chart_record.xml b/src/records/definitions/chart_record.xml deleted file mode 100644 index f1bd8fc9d9..0000000000 --- a/src/records/definitions/chart_record.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - Record - Record - The chart record is used to define the location and size of a chart. - Glen Stampoultzis (glens at apache.org) - - - - - - - diff --git a/src/records/definitions/common_object_data_record.xml b/src/records/definitions/common_object_data_record.xml deleted file mode 100644 index ad7ebfd183..0000000000 --- a/src/records/definitions/common_object_data_record.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - SubRecord - SubRecord - The common object data record is used to store all common preferences for an excel object. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/dat_record.xml b/src/records/definitions/dat_record.xml deleted file mode 100644 index bda909ea5a..0000000000 --- a/src/records/definitions/dat_record.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - Record - Record - The dat record is used to store options for the chart. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - diff --git a/src/records/definitions/dataformat_record.xml b/src/records/definitions/dataformat_record.xml deleted file mode 100644 index 3720e24ff8..0000000000 --- a/src/records/definitions/dataformat_record.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - Record - Record - The data format record is used to index into a series. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - diff --git a/src/records/definitions/default_data_label_text_properties_record.xml b/src/records/definitions/default_data_label_text_properties_record.xml deleted file mode 100644 index 9a0e755bd5..0000000000 --- a/src/records/definitions/default_data_label_text_properties_record.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - Record - Record - The default data label text properties record identifies the text characteristics of the preceeding text record. - Glen Stampoultzis (glens at apache.org) - - - - - - - - diff --git a/src/records/definitions/font_basis_record.xml b/src/records/definitions/font_basis_record.xml deleted file mode 100644 index e16b292fe8..0000000000 --- a/src/records/definitions/font_basis_record.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - Record - Record - The font basis record stores various font metrics. - Glen Stampoultzis (glens at apache.org) - - - - - - - - diff --git a/src/records/definitions/font_example.xml b/src/records/definitions/font_example.xml deleted file mode 100644 index 9bf54470a6..0000000000 --- a/src/records/definitions/font_example.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - Record - Record - Describes a font record. In Excel a font belongs in the font table. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/font_index_record.xml b/src/records/definitions/font_index_record.xml deleted file mode 100644 index bac26e2cb9..0000000000 --- a/src/records/definitions/font_index_record.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Record - Record - The font index record indexes into the font table for the text record. - Glen Stampoultzis (glens at apache.org) - - - - diff --git a/src/records/definitions/frame_record.xml b/src/records/definitions/frame_record.xml deleted file mode 100644 index b3b033998c..0000000000 --- a/src/records/definitions/frame_record.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - Record - Record - The frame record indicates whether there is a border around the displayed text of a chart. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - diff --git a/src/records/definitions/legend_record.xml b/src/records/definitions/legend_record.xml deleted file mode 100644 index 577443e960..0000000000 --- a/src/records/definitions/legend_record.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - Record - Record - Defines a legend for a chart. - Andrew C. Oliver (acoliver at apache.org) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 76 0E 00 00 86 07 00 00 19 01 00 00 8B 00 00 00 03 01 1F 00 - - 24 - diff --git a/src/records/definitions/line_format_record.xml b/src/records/definitions/line_format_record.xml deleted file mode 100644 index f55679fcef..0000000000 --- a/src/records/definitions/line_format_record.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - Record - Record - Describes a line format record. The line format record controls how a line on a chart appears. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/linked_data_record.xml b/src/records/definitions/linked_data_record.xml deleted file mode 100644 index bd247bd63e..0000000000 --- a/src/records/definitions/linked_data_record.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - Record - Record - Describes a linked data record. This record refers to the series data or text. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/number_format_index_record.xml b/src/records/definitions/number_format_index_record.xml deleted file mode 100644 index 08d5f5c7fa..0000000000 --- a/src/records/definitions/number_format_index_record.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Record - Record - The number format index record indexes format table. This applies to an axis. - Glen Stampoultzis (glens at apache.org) - - - - diff --git a/src/records/definitions/object_link_record.xml b/src/records/definitions/object_link_record.xml deleted file mode 100644 index 03848bb8f2..0000000000 --- a/src/records/definitions/object_link_record.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - Record - Record - Links text to an object on the chart or identifies it as the title. - Andrew C. Oliver (acoliver at apache.org) - - - - - - - - - - - - - - - - - - 03 00 00 00 00 00 - - 10 - diff --git a/src/records/definitions/pane_record.xml b/src/records/definitions/pane_record.xml deleted file mode 100644 index 436443113a..0000000000 --- a/src/records/definitions/pane_record.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - Record - Record - Describes the frozen and unfozen panes. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - diff --git a/src/records/definitions/plotgrowth_record.xml b/src/records/definitions/plotgrowth_record.xml deleted file mode 100644 index 469b9816b4..0000000000 --- a/src/records/definitions/plotgrowth_record.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - Record - Record - The plot growth record specifies the scaling factors used when a font is scaled. - Glen Stampoultzis (glens at apache.org) - - - - - diff --git a/src/records/definitions/scl_record.xml b/src/records/definitions/scl_record.xml deleted file mode 100644 index abe21b15ba..0000000000 --- a/src/records/definitions/scl_record.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Record - Record - Specifies the window's zoom magnification. If this record isn't present then the windows zoom is 100%. see p384 Excel Dev Kit - Andrew C. Oliver (acoliver at apache.org) - - - - - diff --git a/src/records/definitions/series_chart_group_record.xml b/src/records/definitions/series_chart_group_record.xml deleted file mode 100644 index 84338f144f..0000000000 --- a/src/records/definitions/series_chart_group_record.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - Record - Record - The series chart group index record stores the index to the CHARTFORMAT record (0 based). - Glen Stampoultzis (glens at apache.org) - - - - diff --git a/src/records/definitions/series_index_record.xml b/src/records/definitions/series_index_record.xml deleted file mode 100644 index a35e019252..0000000000 --- a/src/records/definitions/series_index_record.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - Record - Record - links a series to its position in the series list. - Andrew C. Oliver (acoliver at apache.org) - - - - - - - 03 00 - - 6 - diff --git a/src/records/definitions/series_record.xml b/src/records/definitions/series_record.xml deleted file mode 100644 index e6d516410d..0000000000 --- a/src/records/definitions/series_record.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - Record - Record - The series record describes the overall data for a series. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/series_text_record.xml b/src/records/definitions/series_text_record.xml deleted file mode 100644 index f86aa2da87..0000000000 --- a/src/records/definitions/series_text_record.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - Record - Record - Defines a series name - Andrew C. Oliver (acoliver at apache.org) - - - - - - - - - - - - - - - 00 00 0C 01 56 00 61 00 6C 00 75 00 65 00 20 00 4E 00 75 00 6D 00 62 00 65 00 72 00 - 32 - diff --git a/src/records/definitions/sertocrt_record.xml b/src/records/definitions/sertocrt_record.xml deleted file mode 100644 index a904e96c85..0000000000 --- a/src/records/definitions/sertocrt_record.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - Record - Record - Indicates the chart-group index for a series. The order probably defines the mapping. So the 0th record probably means the 0th series. The only field in this of course defines which chart group the 0th series (for instance) would map to. Confusing? Well thats because it is. (p 522 BCG) - Andrew C. Oliver (acoliver at apache.org) - - - - diff --git a/src/records/definitions/sheet_properties_record.xml b/src/records/definitions/sheet_properties_record.xml deleted file mode 100644 index 97c5300e76..0000000000 --- a/src/records/definitions/sheet_properties_record.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - Record - Record - Describes a chart sheet properties record. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - diff --git a/src/records/definitions/subrecord.xsl b/src/records/definitions/subrecord.xsl deleted file mode 100644 index 01016bc6b2..0000000000 --- a/src/records/definitions/subrecord.xsl +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - -package ; - - - -import org.apache.poi.util.*; - -/** - * - * NOTE: This source is automatically generated please do not modify this file. Either subclass or - * remove the record in src/records/definitions. - - */ -public class SubRecord - extends SubRecord -{ - public final static short sid = ; - private ; - - - - public SubRecord() - { - - - = ; - - } - - /** - * Constructs a record and sets its fields appropriately. - * - * @param id id must be or an exception - * will be throw upon validation - * @param size size the size of the data area of the record - * @param data data of the record (should not contain sid/len) - */ - - public SubRecord(short id, short size, byte [] data) - { - super(id, size, data); - - - - = - ; - - - - } - - /** - * Constructs a record and sets its fields appropriately. - * - * @param id id must be or an exception - * will be throw upon validation - * @param size size the size of the data area of the record - * @param data data of the record (should not contain sid/len) - * @param offset of the record's data - */ - - public SubRecord(short id, short size, byte [] data, int offset) - { - super(id, size, data, offset); - - - - = - ; - - - - } - - /** - * Checks the sid matches the expected side for this record - * - * @param id the expected sid. - */ - protected void validateSid(short id) - { - if (id != sid) - { - throw new RecordFormatException("Not a record"); - } - } - - protected void fillFields(byte [] data, short size, int offset) - { - - int pos = 0; - - - - - ; - - } - - public String toString() - { - StringBuffer buffer = new StringBuffer(); - - buffer.append("[]\n"); - - buffer.append("[/]\n"); - return buffer.toString(); - } - - public int serialize(int offset, byte[] data) - { - int pos = 0; - - LittleEndian.putShort(data, 0 + offset, sid); - LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4)); - - - - - - return getRecordSize(); - } - - /** - * Size of record (exluding 4 byte header) - */ - public int getRecordSize() - { - - return 4 - - -; - } - - public short getSid() - { - return this.sid; - } - - public Object clone() { - SubRecord rec = new SubRecord(); - - - ; - - return rec; - } - - - - -} // END OF CLASS - - - - - - - - - /** - * Sets the field value. - * - */ - public void set(boolean value) - { - = .setBoolean(, value); - } - - /** - * - * @return the field value. - */ - public boolean is() - { - return .isSet(); - } - - - /** - * Sets the field value. - * - */ - public void set(short value) - { - = .setValue(, value); - } - - /** - * - * @return the field value. - */ - public short get() - { - return .getShortValue(); - } - - - - - private BitField = new BitField(); - private BitField = new BitField(); - - - public final static = ; - - - - - * - - - /** - * Get the field for the record. - * - * @return One of - */ - public get() - { - return ; - } - - /** - * Set the field for the record. - * - * @param - * One of - */ - public void set( ) - { - this. = ; - } - - - - - - buffer.append(System.getProperty("line.separator")); - - - - - - - buffer.append(" . - - = ").append(is - - ()).append('\n'); - - - buffer.append(" . - - = ").append(get - - ()).append('\n'); - - - - - * @author - - - diff --git a/src/records/definitions/subrecord_test.xsl b/src/records/definitions/subrecord_test.xsl deleted file mode 100644 index c729b41309..0000000000 --- a/src/records/definitions/subrecord_test.xsl +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - -package ; - - -import junit.framework.TestCase; - -/** - * Tests the serialization and deserialization of the SubRecord - * class works correctly. Test data taken directly from a real - * Excel file. - * - - */ -public class TestSubRecord - extends TestCase -{ - byte[] data = new byte[] { - - }; - - public TestSubRecord(String name) - { - super(name); - } - - public void testLoad() - throws Exception - { - SubRecord record = new SubRecord((short), (short)data.length, data); - - - - assertEquals( "", record.get()); - - assertEquals( (byte), record.get()); - - assertEquals( (short), record.get()); - - assertEquals( (int), record.get()); - - assertEquals( (double), record.get()); - - - - - assertEquals( , record.getRecordSize() ); - - record.validateSid((short)); - } - - public void testStore() - { - SubRecord record = new SubRecord(); - - - - - record.set( "" ); - - record.set( (byte) ); - - record.set( (short) ); - - record.set( (int) ); - - record.set( (double) ); - - - - - - byte [] recordBytes = record.serialize(); - assertEquals(recordBytes.length - 4, data.length); - for (int i = 0; i < data.length; i++) - assertEquals("At offset " + i, data[i], recordBytes[i+4]); - } -} - - - - * @author - - - - assertEquals( , record.is() ); - - - - - record.set( ); - - - - diff --git a/src/records/definitions/text_record.xml b/src/records/definitions/text_record.xml deleted file mode 100644 index c486a7fd9e..0000000000 --- a/src/records/definitions/text_record.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - Record - Record - The text record is used to define text stored on a chart. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/textobject_record.xml b/src/records/definitions/textobject_record.xml deleted file mode 100644 index 8e7e6e83ca..0000000000 --- a/src/records/definitions/textobject_record.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - Record - Record - The TXO record is used to define the properties of a text box. It is followed - by two continue records unless there is no actual text. The first continue record contains - the text data and the next continue record contains the formatting runs. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/tick_record.xml b/src/records/definitions/tick_record.xml deleted file mode 100644 index d1f704a7c8..0000000000 --- a/src/records/definitions/tick_record.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - Record - Record - The Tick record defines how tick marks and label positioning/formatting - Andrew C. Oliver(acoliver at apache.org) - - - - - - - - - - - - - - - - - - - - diff --git a/src/records/definitions/value_range_record.xml b/src/records/definitions/value_range_record.xml deleted file mode 100644 index c5be1d8192..0000000000 --- a/src/records/definitions/value_range_record.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - Record - Record - The value range record defines the range of the value axis. - Glen Stampoultzis (glens at apache.org) - - - - - - - - - - - - - - - - - - - diff --git a/src/records/styles/record.xsl b/src/records/styles/record.xsl deleted file mode 100644 index dae346b5dc..0000000000 --- a/src/records/styles/record.xsl +++ /dev/null @@ -1,570 +0,0 @@ -<<<<<<< record.xsl - - - - - - - -package ; - - - -import org.apache.poi.util.*; - -/** - * - * NOTE: This source is automatically generated please do not modify this file. Either subclass or - * remove the record in src/records/definitions. - - */ -public class Record - extends Record -{ - public final static short sid = ; - private ; - - - - public Record() - { - - - = ; - - } - - /** - * Constructs a record and sets its fields appropriately. - * - * @param id id must be or an exception - * will be throw upon validation - * @param size size the size of the data area of the record - * @param data data of the record (should not contain sid/len) - */ - - public Record(RecordInputStream in) - { - super(in); - - - - = - ; - - - - } - - /** - * Checks the sid matches the expected side for this record - * - * @param id the expected sid. - */ - protected void validateSid(short id) - { - if (id != sid) - { - throw new RecordFormatException("Not a record"); - } - } - - protected void fillFields(RecordInputStream in) - { - - int pos = 0; - - - - - ; - - } - - public String toString() - { - StringBuffer buffer = new StringBuffer(); - - buffer.append("[]\n"); - - buffer.append("[/]\n"); - return buffer.toString(); - } - - public int serialize(int offset, byte[] data) - { - int pos = 0; - - LittleEndian.putShort(data, 0 + offset, sid); - LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4)); - - - - - - return getRecordSize(); - } - - /** - * Size of record (exluding 4 byte header) - */ - public int getRecordSize() - { - - return 4 - - -; - } - - public short getSid() - { - return this.sid; - } - - public Object clone() { - Record rec = new Record(); - - - ; - - return rec; - } - - - - - - -} // END OF CLASS - - - - - - - - - - - /** - * Sets the field value. - * - */ - public void set(boolean value) - { - = .setBoolean(, value); - } - - /** - * - * @return the field value. - */ - public boolean is() - { - return .isSet(); - } - - - /** - * Sets the field value. - * - */ - public void set(short value) - { - = .setValue(, value); - } - - /** - * - * @return the field value. - */ - public short get() - { - return .getShortValue(); - } - - - - - private BitField = new BitField(); - private BitField = new BitField(); - - - public final static = ; - - - - - * - - - /** - * Get the field for the record. - * - * @return One of - */ - public get() - { - return ; - } - - /** - * Set the field for the record. - * - * @param - * One of - */ - public void set( ) - { - this. = ; - } - - - - - - buffer.append(System.getProperty("line.separator")); - - - - - - - buffer.append(" . - - = ").append(is - - ()).append('\n'); - - - buffer.append(" . - - = ").append(get - - ()).append('\n'); - - - - - * @author - - - -======= - - - - -/* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -==================================================================== */ - - -package ; - - - -import org.apache.poi.util.*; - -/** - * - * NOTE: This source is automatically generated please do not modify this file. Either subclass or - * remove the record in src/records/definitions. - - */ -public class Record - extends Record -{ - public final static short sid = ; - private ; - - - - public Record() - { - - - = ; - - } - - /** - * Constructs a record and sets its fields appropriately. - * - * @param id id must be or an exception - * will be throw upon validation - * @param size size the size of the data area of the record - * @param data data of the record (should not contain sid/len) - */ - - public Record(short id, short size, byte [] data) - { - super(id, size, data); - - - - = - ; - - - - } - - /** - * Constructs a record and sets its fields appropriately. - * - * @param id id must be or an exception - * will be throw upon validation - * @param size size the size of the data area of the record - * @param data data of the record (should not contain sid/len) - * @param offset of the record's data - */ - - public Record(short id, short size, byte [] data, int offset) - { - super(id, size, data, offset); - - - - = - ; - - - - } - - /** - * Checks the sid matches the expected side for this record - * - * @param id the expected sid. - */ - protected void validateSid(short id) - { - if (id != sid) - { - throw new RecordFormatException("Not a record"); - } - } - - protected void fillFields(byte [] data, short size, int offset) - { - - int pos = 0; - - - - - ; - - } - - public String toString() - { - StringBuffer buffer = new StringBuffer(); - - buffer.append("[]\n"); - - buffer.append("[/]\n"); - return buffer.toString(); - } - - public int serialize(int offset, byte[] data) - { - int pos = 0; - - LittleEndian.putShort(data, 0 + offset, sid); - LittleEndian.putShort(data, 2 + offset, (short)(getRecordSize() - 4)); - - - - - - return getRecordSize(); - } - - /** - * Size of record (exluding 4 byte header) - */ - public int getRecordSize() - { - - return 4 - - -; - } - - public short getSid() - { - return this.sid; - } - - public Object clone() { - Record rec = new Record(); - - - ; - - return rec; - } - - - - - - -} // END OF CLASS - - - - - - - - - - - /** - * Sets the field value. - * - */ - public void set(boolean value) - { - = .setBoolean(, value); - } - - /** - * - * @return the field value. - */ - public boolean is() - { - return .isSet(); - } - - - /** - * Sets the field value. - * - */ - public void set(short value) - { - = .setValue(, value); - } - - /** - * - * @return the field value. - */ - public short get() - { - return .getShortValue(); - } - - - - - private BitField = new BitField(); - private BitField = new BitField(); - - - public final static = ; - - - - - * - - - /** - * Get the field for the record. - * - * @return One of - */ - public get() - { - return ; - } - - /** - * Set the field for the record. - * - * @param - * One of - */ - public void set( ) - { - this. = ; - } - - - - - - buffer.append(System.getProperty("line.separator")); - - - - - - - buffer.append(" . - - = ").append(is - - ()).append('\n'); - - - buffer.append(" . - - = ").append(get - - ()).append('\n'); - - - - - * @author - - - ->>>>>>> 1.11 diff --git a/src/records/styles/record_document.xsl b/src/records/styles/record_document.xsl deleted file mode 100644 index 7895c661ba..0000000000 --- a/src/records/styles/record_document.xsl +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - -
- <xsl:value-of select="@name"/> Record Documentation -
- - - -

-

- - - - - - - - - - - -
NameSizeOffsetDescriptionDefault Value
- - -
- - Copyright (c) @year@ The Poi Project All rights reserved. - -
- - - - - - - - - - - - - - - diff --git a/src/records/styles/record_test.xsl b/src/records/styles/record_test.xsl deleted file mode 100644 index a70a9491b7..0000000000 --- a/src/records/styles/record_test.xsl +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - -package ; - - -import junit.framework.TestCase; - -/** - * Tests the serialization and deserialization of the Record - * class works correctly. Test data taken directly from a real - * Excel file. - * - - */ -public class TestRecord - extends TestCase -{ - byte[] data = new byte[] { - - }; - - public TestRecord(String name) - { - super(name); - } - - public void testLoad() - throws Exception - { - Record record = new Record((short), (short)data.length, data); - - - - assertEquals( "", record.get()); - - assertEquals( (byte), record.get()); - - assertEquals( (short), record.get()); - - assertEquals( (int), record.get()); - - assertEquals( (double), record.get()); - - - - - assertEquals( , record.getRecordSize() ); - - record.validateSid((short)); - } - - public void testStore() - { - Record record = new Record(); - - - - - record.set( "" ); - - record.set( (byte) ); - - record.set( (short) ); - - record.set( (int) ); - - record.set( (double) ); - - - - - - byte [] recordBytes = record.serialize(); - assertEquals(recordBytes.length - 4, data.length); - for (int i = 0; i < data.length; i++) - assertEquals("At offset " + i, data[i], recordBytes[i+4]); - } -} - - - - * @author - - - - assertEquals( , record.is() ); - - - - - record.set( ); - - - - diff --git a/src/scratchpad/testcases/dummy.txt b/src/scratchpad/testcases/dummy.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/types/definitions/FFData_type.xml b/src/types/definitions/FFData_type.xml deleted file mode 100644 index 2016adb6dd..0000000000 --- a/src/types/definitions/FFData_type.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - AbstractType - The FFData structure specifies form field data for a text - box, check box, or drop-down list box. <p>Class and fields - descriptions are quoted from [MS-DOC] -- v20121003 Word (.doc) Binary - File Format; Copyright (c) 2012 Microsoft Corporation; Release: - October 8, 2012 - - Sergey Vladimirov; according to [MS-DOC] -- v20121003 Word - (.doc) Binary File Format; Copyright (c) 2012 Microsoft Corporation; - Release: October 8, 2012 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/FibBase_type.xml b/src/types/definitions/FibBase_type.xml deleted file mode 100644 index 37c81a4466..0000000000 --- a/src/types/definitions/FibBase_type.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - AbstractType - Base part of the File information Block (FibBase). Holds the core part of the FIB, - from the first 32 bytes. <p>Class and fields descriptions are quoted from Microsoft - Office Word 97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File - Format - - Andrew C. Oliver; Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary - File Format Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/FibRgLw95_type.xml b/src/types/definitions/FibRgLw95_type.xml deleted file mode 100644 index 74c5dc53a4..0000000000 --- a/src/types/definitions/FibRgLw95_type.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - AbstractType - The FibRgLw95 structure is the third section of the FIB for Word95. - - Sergey Vladimirov - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/FibRgLw97_type.xml b/src/types/definitions/FibRgLw97_type.xml deleted file mode 100644 index 0fafcc9c81..0000000000 --- a/src/types/definitions/FibRgLw97_type.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - AbstractType - The FibRgLw97 structure is the third section of the FIB. This contains an array of - 4-byte values. <p>Class and fields descriptions are quoted from Microsoft Office Word - 97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/FibRgW97_type.xml b/src/types/definitions/FibRgW97_type.xml deleted file mode 100644 index 7f902d2f3e..0000000000 --- a/src/types/definitions/FibRgW97_type.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - AbstractType - The FibRgW97 structure is a variable-length portion of the Fib. <p>Class and - fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and - [MS-DOC] - v20110608 Word (.doc) Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/LFOLVLBase_type.xml b/src/types/definitions/LFOLVLBase_type.xml deleted file mode 100644 index 1cafd752d8..0000000000 --- a/src/types/definitions/LFOLVLBase_type.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - AbstractType - The LFOLVL structure contains information that is used to override the formatting - information of a corresponding LVL. <p>Class and fields descriptions are quoted from - Microsoft Office Word 97-2007 Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary - File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - diff --git a/src/types/definitions/StdfBase_type.xml b/src/types/definitions/StdfBase_type.xml deleted file mode 100644 index 5b9918ffef..0000000000 --- a/src/types/definitions/StdfBase_type.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - AbstractType - The StdfBase structure specifies general information about a style. <p>Class - and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and - [MS-DOC] - v20110608 Word (.doc) Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/StdfPost2000_type.xml b/src/types/definitions/StdfPost2000_type.xml deleted file mode 100644 index 277962f08e..0000000000 --- a/src/types/definitions/StdfPost2000_type.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - AbstractType - The StdfPost2000 structure specifies general information about a style. - <p>Class and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary - File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - diff --git a/src/types/definitions/Stshif_type.xml b/src/types/definitions/Stshif_type.xml deleted file mode 100644 index cab40209ff..0000000000 --- a/src/types/definitions/Stshif_type.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - AbstractType - The Stshif structure specifies general stylesheet information. <p>Class and - fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format and - [MS-DOC] - v20110608 Word (.doc) Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/bkf_type.xml b/src/types/definitions/bkf_type.xml deleted file mode 100644 index 32a4b1ca23..0000000000 --- a/src/types/definitions/bkf_type.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - AbstractType - HDFType - BooKmark First descriptor (BKF). <p>Class and fields descriptions are - quoted - from Microsoft Office Word 97-2007 Binary File Format (.doc) Specification - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format (.doc) - Specification - - - - - - - - - - - diff --git a/src/types/definitions/chp_type.xml b/src/types/definitions/chp_type.xml deleted file mode 100644 index 5d77786e1d..0000000000 --- a/src/types/definitions/chp_type.xml +++ /dev/null @@ -1,358 +0,0 @@ - - - - AbstractType - HDFType - Character Properties. - S. Ryan Ackley - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/dml-shapeGeometry.xjb b/src/types/definitions/dml-shapeGeometry.xjb deleted file mode 100644 index 8d05c62914..0000000000 --- a/src/types/definitions/dml-shapeGeometry.xjb +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/src/types/definitions/dop_type.xml b/src/types/definitions/dop_type.xml deleted file mode 100644 index 77de331bf6..0000000000 --- a/src/types/definitions/dop_type.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - - AbstractType - HDFType - Document Properties. - S. Ryan Ackley - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/fld_type.xml b/src/types/definitions/fld_type.xml deleted file mode 100644 index 2c7a0b945d..0000000000 --- a/src/types/definitions/fld_type.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - AbstractType - HDFType - Field Descriptor (FLD). <p>Class and fields descriptions are - quoted from - Microsoft Office Word 97-2007 Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/frd_type.xml b/src/types/definitions/frd_type.xml deleted file mode 100644 index a447413434..0000000000 --- a/src/types/definitions/frd_type.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - AbstractType - HDFType - Footnote Reference Descriptor (FRD). <p>Class and fields descriptions are - quoted from Microsoft Office Word 97-2007 Binary File Format (.doc) Specification - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format (.doc) - Specification - - - - - diff --git a/src/types/definitions/fspa_type.xml b/src/types/definitions/fspa_type.xml deleted file mode 100644 index 42e464aa5a..0000000000 --- a/src/types/definitions/fspa_type.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - AbstractType - HDFType - File Shape Address (FSPA). <p>Class and fields descriptions are quoted from - Microsoft Office Word 97-2007 Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/grfhic_type.xml b/src/types/definitions/grfhic_type.xml deleted file mode 100644 index 0c1cf5c7c5..0000000000 --- a/src/types/definitions/grfhic_type.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - AbstractType - The grfhic structure is a set of HTML incompatibility flags that specify the HTML - incompatibilities of a list structure. The values specify possible incompatibilities between - an LVL or LVLF and HTML lists. The values do not define list properties. <p>Class and - fields descriptions are quoted from [MS-DOC] -- v20110315 Word (.doc) Binary File Format - specification - - Sergey Vladimirov; according to [MS-DOC] -- v20110315 Word (.doc) Binary File Format - specification - - - - - - - - - - - - - - diff --git a/src/types/definitions/hresi_type.xml b/src/types/definitions/hresi_type.xml deleted file mode 100644 index aef96bdf67..0000000000 --- a/src/types/definitions/hresi_type.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - AbstractType - Hyphenation (HRESI). <p>Class and fields descriptions are - quoted from - Microsoft Office Word 97-2007 Binary File Format (.doc) Specification - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format (.doc) - Specification - - - - - - - - - - - - - - diff --git a/src/types/definitions/lfo_type.xml b/src/types/definitions/lfo_type.xml deleted file mode 100644 index 911f6ce6f1..0000000000 --- a/src/types/definitions/lfo_type.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - AbstractType - HDFType - List Format Override (LFO). <p>Class and fields descriptions are quoted from - [MS-DOC] --v20110315; Word (.doc) Binary File Format - - Sergey Vladimirov; according to [MS-DOC] --v20110315; Word (.doc) Binary File Format; - Copyright (c) Microsoft Corporation - - - - - - - - - - - diff --git a/src/types/definitions/lstf_type.xml b/src/types/definitions/lstf_type.xml deleted file mode 100644 index 5c7f1d334f..0000000000 --- a/src/types/definitions/lstf_type.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - AbstractType - The LSTF structure contains formatting properties that apply to an entire list. - <p>Class and fields descriptions are quoted from Microsoft Office Word 97-2007 Binary - File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/lvlf_type.xml b/src/types/definitions/lvlf_type.xml deleted file mode 100644 index c60a4f1b3f..0000000000 --- a/src/types/definitions/lvlf_type.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - AbstractType - The LVLF structure contains formatting properties for an individual level in a - list. <p>Class and fields descriptions are quoted from Microsoft Office Word 97-2007 - Binary File Format and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml deleted file mode 100644 index 710425a4ed..0000000000 --- a/src/types/definitions/pap_type.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - AbstractType - HDFType - Paragraph Properties. - S. Ryan Ackley - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/picf_type.xml b/src/types/definitions/picf_type.xml deleted file mode 100644 index cdda965020..0000000000 --- a/src/types/definitions/picf_type.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - AbstractType - The PICF structure specifies the type of a picture, as well as the size of the - picture and information about its border. <p>Class and fields descriptions are quoted - from Microsoft Office Word 97-2007 - Binary File Format and [MS-DOC] - v20110608 Word (.doc) - Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] and [MS-DOC] - v20110608 Word (.doc) Binary File Format - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/sep_type.xml b/src/types/definitions/sep_type.xml deleted file mode 100644 index ff0689bde2..0000000000 --- a/src/types/definitions/sep_type.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - AbstractType - HDFType - Section Properties. - S. Ryan Ackley - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/shd80_type.xml b/src/types/definitions/shd80_type.xml deleted file mode 100644 index 22210ce7b0..0000000000 --- a/src/types/definitions/shd80_type.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - AbstractType - The Shd80 structure specifies the colors and pattern that are used for background - shading. As an exception to the constraints that are specified by Ico and Ipat, a Shd80 can - be set to Shd80Nil and specifies that no shading is applied. <p>Class and fields - descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation - - Sergey Vladimirov; according to Word (.doc) Binary File Format by Microsoft Corporation. - - - - - - - - - diff --git a/src/types/definitions/shd_type.xml b/src/types/definitions/shd_type.xml deleted file mode 100644 index a2c1ba6247..0000000000 --- a/src/types/definitions/shd_type.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - AbstractType - The Shd structure specifies the colors and pattern that are used for background shading. <p>Class - and - fields descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation - - Sergey Vladimirov; according to Word (.doc) Binary File Format by Microsoft Corporation. - - - - - - - diff --git a/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml deleted file mode 100644 index 2a56ddc5e6..0000000000 --- a/src/types/definitions/tap_type.xml +++ /dev/null @@ -1,244 +0,0 @@ - - - - AbstractType - HDFType - Table Properties. Properties descriptions quoted from official 97-2007 binary file - format specification. - - S. Ryan Ackley - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/tbd_type.xml b/src/types/definitions/tbd_type.xml deleted file mode 100644 index 7faeb01bf7..0000000000 --- a/src/types/definitions/tbd_type.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - AbstractType - The TBD is a substructure of the PAP. <p>Class and fields descriptions are quoted from - Microsoft Office Word 97-2007 Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/tc_type.xml b/src/types/definitions/tc_type.xml deleted file mode 100644 index 7df82bd658..0000000000 --- a/src/types/definitions/tc_type.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - AbstractType - HDFType - Table Cell Descriptor. - S. Ryan Ackley. Field descriptions are quoted from Microsoft Office Word 97-2007 Binary - File Format (.doc) Specification - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/types/definitions/tlp_type.xml b/src/types/definitions/tlp_type.xml deleted file mode 100644 index b915e6e9b4..0000000000 --- a/src/types/definitions/tlp_type.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - AbstractType - HDFType - Table Autoformat Look sPecifier (TLP). <p>Class and fields descriptions are - quoted from Microsoft Office Word 97-2007 Binary File Format - - Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] - - - - - - - - - - - - - - diff --git a/src/types/styles/hdftype.xsl b/src/types/styles/hdftype.xsl deleted file mode 100644 index d8c90e7523..0000000000 --- a/src/types/styles/hdftype.xsl +++ /dev/null @@ -1,642 +0,0 @@ - - - - - - - - - - - - - /* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -==================================================================== */ - - - -package ; - - -import org.apache.poi.hwpf.usermodel.*; -import org.apache.poi.util.*; - -/** - * - * <p> - * NOTE: This source is automatically generated please do not modify this file. Either subclass or - * remove the record in src/types/definitions. - * <p> - * This class is internal. It content or properties may change without notice - * due to changes in our knowledge of internal Microsoft Word binary structures. - - */ -@Internal -public abstract class -{ - - - - - - @Deprecated - - - - protected - - field_ - - _ - - ; - - - - - - - - protected - - AbstractType() - - - { - - - - - - - this. - - = - - ; - - - - - - - - - - - - this. - - = new byte[ - - ]; - - - - - - this. - - = new - - [0]; - - - - - - this. - - = new - - (); - - - - - - } - - - - - -protected void fillFields( byte[] data, int offset ) - { - - - - - - - = - - ; - - - - } - - - - - - public void serialize( byte[] data, int offset ) - { - - - - - - - - - - } - - - public byte[] serialize() - { - final byte[] result = new byte[ getSize() ]; - serialize( result, 0 ); - return result; - } - - - /** - * Size of record - */ - public static int getSize() - { - - - - return 0 - - - - - ; - - - } - - - - - - - @Override - - - public boolean equals( Object obj ) - { - if ( this == obj ) - return true; - if ( obj == null ) - return false; - if ( getClass() != obj.getClass() ) - return false; - - - - - other = ( - - ) obj; - - - - - - - - if ( - !Arrays.equals( - - , other. - - ) - ) - - - - - return false; - - - - if ( - - != other. - - ) - - - - - return false; - - - - if ( - - == null ) - - - - { - - - - - if ( other. - - != null ) - - - - - - return false; - - - - } - - - - else if ( ! - - .equals( other. - - ) ) - - - - - return false; - - - - - - - return true; - - - } - - - - - - @Override - - - public int hashCode() - { - final int prime = 31; - int result = 1; - - - - - result = prime * result - - - - + - Arrays.hashCode( - - ) - - - + - ( - - ? 1231 : 1237 ) - - - + - - - - - - - - - + (int) ( - - ^ ( - - >>> 32 ) ) - - - - - - - - + (( - - == null) ? 0 : - - .hashCode()) - - - ; - - - - - return result; - - - } - - - - - - - - - -} // END OF CLASS - - - - - - - /** - * Sets the field value. - * - */ - @Internal - public void set( value ) - { - = ; - } - - /** - * - * @return the field value. - - - - * @deprecated This field should not be used according to specification - - - - */ - - - @Internal - - - - @Deprecated - - - - public () - { - return - } - - - - - - /**/private static final BitField - - = new BitField( - - ); - - - - - - - - - - /** - - - /** - - - - */ - - - - - - /* */ - - - /**/ - - - protected final static - - - - = - - ; - - - - - - - * <li>{@link # - - } - - - - - - - - - - - - - /** - * - - - - - Get the - - field for the - - record - - - . - - * - * @return One of - */ - @Internal - public get() - { - return ; - } - - /** - * - - - - - Set the - - field for the - - record - - - . - - * - * @param - * One of - */ - @Internal - public void set( ) - { - this. = ; - } - - - - - public String toString() - - - - { - - - - - StringBuilder builder = new StringBuilder(); - - - - - - builder.append("[ - - ]\n"); - - - - - - - - builder.append("[/ - - ]"); - return builder.toString(); - } - - - - - - - - - builder.append( " . - - = " ); - - - - - builder.append(" ( ").append( - - - - - - - == null ? "null" : - - .toString().replaceAll( "\n", "\n " ) - - - ).append( " )\n" ); - - - - - - - - - builder.append(" . - - = ").append( - - ()).append('\n'); - - - - - * @author - - - diff --git a/src/types/styles/hdftype_document.xsl b/src/types/styles/hdftype_document.xsl deleted file mode 100644 index f7bfb720cd..0000000000 --- a/src/types/styles/hdftype_document.xsl +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - -
- <xsl:value-of select="@name"/> Documentation For HDF Type -
- - - -

-

- - - - - - - - - - - -
NameSizeOffsetDescriptionDefault Value
- - -
- - Copyright (c) @year@ The Poi Project All rights reserved. - -
- - - - - - - - - - - - - - - diff --git a/src/types/styles/hdftype_test.xsl b/src/types/styles/hdftype_test.xsl deleted file mode 100644 index d95c81bb3b..0000000000 --- a/src/types/styles/hdftype_test.xsl +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - -package ; - - -import junit.framework.TestCase; - -/** - * Tests the serialization and deserialization of the Type - * class works correctly. Test data taken directly from a real - * Excel file. - * - - */ -public class TestType - extends TestCase -{ - byte[] data = new byte[] { - // PASTE DATA HERE - }; - - public TestType(String name) - { - super(name); - } - - public void testLoad() - throws Exception - { - - Type type = new Type((short), (short)data.length, data); - assertEquals( XXX, type.get()); - - - - assertEquals( XXX, type.getSize() ); - - type.validateSid((short)); - } - - public void testStore() - { - Type type = new Type(); - type.set( XXXX ); - - - - byte [] typeBytes = type.serialize(); - assertEquals(typeBytes.length - 4, data.length); - for (int i = 0; i < data.length; i++) - assertEquals("At offset " + i, data[i], typeBytes[i+4]); - } -} - - - - * @author - - - - assertEquals( XXX, type.is() ); - - - - - type.set( XXX ); - - - -