diff --git a/src/ooxml/java/org/apache/poi/POIXMLDocument.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLDocument.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLDocument.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLDocument.java
diff --git a/src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLDocumentPart.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLDocumentPart.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLDocumentPart.java
diff --git a/src/ooxml/java/org/apache/poi/POIXMLException.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLException.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLException.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLException.java
diff --git a/src/ooxml/java/org/apache/poi/POIXMLFactory.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLFactory.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLFactory.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLFactory.java
diff --git a/src/ooxml/java/org/apache/poi/POIXMLProperties.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLProperties.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLProperties.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLProperties.java
diff --git a/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/POIXMLRelation.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLRelation.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLRelation.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLRelation.java
diff --git a/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/POIXMLTextExtractor.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
rename to poi-ooxml/src/main/java/org/apache/poi/POIXMLTextExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java b/poi-ooxml/src/main/java/org/apache/poi/dev/OOXMLLister.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
rename to poi-ooxml/src/main/java/org/apache/poi/dev/OOXMLLister.java
diff --git a/src/ooxml/java/org/apache/poi/extractor/CommandLineTextExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/extractor/CommandLineTextExtractor.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/extractor/CommandLineTextExtractor.java
rename to poi-ooxml/src/main/java/org/apache/poi/extractor/CommandLineTextExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/poi-ooxml/src/main/java/org/apache/poi/extractor/ExtractorFactory.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
rename to poi-ooxml/src/main/java/org/apache/poi/extractor/ExtractorFactory.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/CompressionOption.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/CompressionOption.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/CompressionOption.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/CompressionOption.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/Configuration.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/Configuration.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/Configuration.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/Configuration.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/EncryptionOption.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/EncryptionOption.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/EncryptionOption.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/EncryptionOption.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/Package.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/Package.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/Package.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/Package.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/signature/DigitalCertificatePart.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalCertificatePart.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalSignatureOriginPart.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalSignatureOriginPart.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalSignatureOriginPart.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/signature/DigitalSignatureOriginPart.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignature.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignature.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignature.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignature.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignatureManager.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignatureManager.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignatureManager.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/signature/PackageDigitalSignatureManager.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/Nullable.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/Nullable.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/openxml4j/util/Nullable.java
rename to poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/Nullable.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
rename to poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
rename to poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
rename to poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
rename to poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
rename to poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
diff --git a/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/poi-ooxml/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
rename to poi-ooxml/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
diff --git a/src/ooxml/java/org/apache/poi/util/IdentifierManager.java b/poi-ooxml/src/main/java/org/apache/poi/util/IdentifierManager.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/util/IdentifierManager.java
rename to poi-ooxml/src/main/java/org/apache/poi/util/IdentifierManager.java
diff --git a/src/ooxml/java/org/apache/poi/util/OOXMLLite.java b/poi-ooxml/src/main/java/org/apache/poi/util/OOXMLLite.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/util/OOXMLLite.java
rename to poi-ooxml/src/main/java/org/apache/poi/util/OOXMLLite.java
diff --git a/src/ooxml/java/org/apache/poi/util/PackageHelper.java b/poi-ooxml/src/main/java/org/apache/poi/util/PackageHelper.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/util/PackageHelper.java
rename to poi-ooxml/src/main/java/org/apache/poi/util/PackageHelper.java
diff --git a/src/ooxml/java/org/apache/poi/util/SAXHelper.java b/poi-ooxml/src/main/java/org/apache/poi/util/SAXHelper.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/util/SAXHelper.java
rename to poi-ooxml/src/main/java/org/apache/poi/util/SAXHelper.java
diff --git a/src/ooxml/java/org/apache/poi/util/Units.java b/poi-ooxml/src/main/java/org/apache/poi/util/Units.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/util/Units.java
rename to poi-ooxml/src/main/java/org/apache/poi/util/Units.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/XSLFSlideShow.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/XSLFSlideShow.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/AbsExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AbsExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/AbsExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AbsExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/AddDivideExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AddDivideExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/AddDivideExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AddDivideExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/AddSubtractExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AddSubtractExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/AddSubtractExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AddSubtractExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/AdjustValue.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AdjustValue.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/AdjustValue.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/AdjustValue.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/ArcTanExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ArcTanExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/ArcTanExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ArcTanExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/ArcToCommand.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ArcToCommand.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/ArcToCommand.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ArcToCommand.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/ClosePathCommand.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ClosePathCommand.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/ClosePathCommand.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ClosePathCommand.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/Context.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Context.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/Context.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Context.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/CosExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CosExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/CosExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CosExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/CosineArcTanExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CosineArcTanExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/CosineArcTanExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CosineArcTanExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/CurveToCommand.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CurveToCommand.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/CurveToCommand.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CurveToCommand.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/CustomGeometry.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CustomGeometry.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/CustomGeometry.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/CustomGeometry.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/Expression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Expression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/Expression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Expression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/ExpressionParser.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ExpressionParser.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/ExpressionParser.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ExpressionParser.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/Formula.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Formula.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/Formula.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Formula.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/Guide.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Guide.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/Guide.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Guide.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/IAdjustableShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/IAdjustableShape.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/IAdjustableShape.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/IAdjustableShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/IfElseExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/IfElseExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/IfElseExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/IfElseExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/LineToCommand.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/LineToCommand.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/LineToCommand.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/LineToCommand.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/LiteralValueExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/LiteralValueExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/LiteralValueExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/LiteralValueExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/MaxExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MaxExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/MaxExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MaxExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/MinExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MinExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/MinExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MinExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/ModExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ModExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/ModExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/ModExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/MoveToCommand.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MoveToCommand.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/MoveToCommand.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MoveToCommand.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/MultiplyDivideExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MultiplyDivideExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/MultiplyDivideExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/MultiplyDivideExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/Outline.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Outline.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/Outline.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Outline.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/Path.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Path.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/Path.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/Path.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/PathCommand.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/PathCommand.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/PathCommand.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/PathCommand.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/PinExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/PinExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/PinExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/PinExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/PresetGeometries.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/PresetGeometries.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/PresetGeometries.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/PresetGeometries.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/QuadToCommand.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/QuadToCommand.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/QuadToCommand.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/QuadToCommand.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/SinArcTanExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/SinArcTanExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/SinArcTanExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/SinArcTanExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/SinExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/SinExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/SinExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/SinExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/SqrtExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/SqrtExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/SqrtExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/SqrtExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/geom/TanExpression.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/TanExpression.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/model/geom/TanExpression.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/model/geom/TanExpression.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingParagraph.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTable.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTable.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTable.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableCell.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTableCell.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableCell.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTableCell.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTableRow.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTextBody.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextPlaceholder.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTextPlaceholder.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/DrawingTextPlaceholder.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/DrawingTextPlaceholder.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/LineCap.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineCap.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/LineCap.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineCap.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/LineDash.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineDash.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/LineDash.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineDash.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/LineDecoration.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineDecoration.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/LineDecoration.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineDecoration.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/LineEndLength.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineEndLength.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/LineEndLength.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineEndLength.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/LineEndWidth.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineEndWidth.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/LineEndWidth.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/LineEndWidth.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/ListAutoNumber.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/Placeholder.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/Placeholder.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/Placeholder.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/Placeholder.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/RenderableShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/RenderableShape.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/RenderableShape.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/RenderableShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/TextAlign.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextAlign.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/TextAlign.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextAlign.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/TextAutofit.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextAutofit.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/TextAutofit.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextAutofit.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/TextCap.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextCap.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/TextCap.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextCap.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/TextDirection.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextDirection.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/TextDirection.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextDirection.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/TextFragment.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextFragment.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/TextFragment.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/TextFragment.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/VerticalAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/VerticalAlignment.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/VerticalAlignment.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/VerticalAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommonSlideData.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontManager.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontManager.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontManager.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontManager.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFImageRenderer.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFImageRenderer.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFImageRenderer.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFImageRenderer.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRenderingHint.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRenderingHint.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRenderingHint.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRenderingHint.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeType.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeType.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeType.java
rename to poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeType.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/dev/XSSFDump.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/dev/XSSFDump.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFSave.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/dev/XSSFSave.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/dev/XSSFSave.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/dev/XSSFSave.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/IndexedUDFFinder.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/IndexedUDFFinder.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/model/IndexedUDFFinder.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/model/IndexedUDFFinder.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSerie.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSerie.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSerie.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/AbstractXSSFChartSerie.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFCategoryAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFCategoryAxis.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFCategoryAxis.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFCategoryAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartAxis.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartAxis.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartDataFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartDataFactory.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartDataFactory.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartDataFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartLegend.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartLegend.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartLegend.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartLegend.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartUtil.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartUtil.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFChartUtil.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFChartUtil.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFLineChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFLineChartData.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFLineChartData.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFLineChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFManualLayout.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFManualLayout.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFManualLayout.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFManualLayout.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFScatterChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFScatterChartData.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFScatterChartData.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFScatterChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFValueAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFValueAxis.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/usermodel/charts/XSSFValueAxis.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/charts/XSSFValueAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java
rename to poi-ooxml/src/main/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XMLParagraph.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java
rename to poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XMLParagraph.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java
rename to poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/package.html b/poi-ooxml/src/main/java/org/apache/poi/xwpf/package.html
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xwpf/package.html
rename to poi-ooxml/src/main/java/org/apache/poi/xwpf/package.html
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegement.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegement.java
similarity index 100%
rename from src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegement.java
rename to poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegement.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java b/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java b/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java b/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-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/poi-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 poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java