You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/08/22 16:29:29 UTC

[sis] 22/23: Rename the `org.apache.sis.internal` packages in utilities module.

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 17e18b1c471f171b997245a6cf51fc57b4574b12
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Aug 22 17:08:12 2023 +0200

    Rename the `org.apache.sis.internal` packages in utilities module.
---
 .../apache/sis/cloud/aws/s3/ClientFileSystem.java  |  2 +-
 .../main/org/apache/sis/console/AboutCommand.java  | 12 +--
 .../main/org/apache/sis/console/CommandRunner.java |  2 +-
 .../org/apache/sis/console/IdentifierCommand.java  |  2 +-
 .../apache/sis/console/ResourcesDownloader.java    |  4 +-
 .../org/apache/sis/console/TransformCommand.java   |  4 +-
 .../main/org/apache/sis/console/package-info.java  |  2 +-
 .../org/apache/sis/coverage/CoverageCombiner.java  |  4 +-
 .../org/apache/sis/coverage/SampleDimension.java   |  2 +-
 .../org/apache/sis/coverage/SampleRangeFormat.java |  4 +-
 .../coverage/grid/BandAggregateGridCoverage.java   |  2 +-
 .../coverage/grid/CoordinateOperationFinder.java   |  2 +-
 .../apache/sis/coverage/grid/DefaultEvaluator.java |  2 +-
 .../sis/coverage/grid/DimensionalityReduction.java |  4 +-
 .../coverage/grid/FractionalGridCoordinates.java   |  2 +-
 .../org/apache/sis/coverage/grid/GridCoverage.java |  2 +-
 .../sis/coverage/grid/GridCoverageProcessor.java   |  2 +-
 .../org/apache/sis/coverage/grid/GridExtent.java   | 10 +--
 .../org/apache/sis/coverage/grid/GridGeometry.java |  4 +-
 .../sis/coverage/grid/ReducedGridCoverage.java     |  2 +-
 .../sis/coverage/grid/ResampledGridCoverage.java   |  2 +-
 .../apache/sis/coverage/grid/SliceGeometry.java    |  2 +-
 .../sis/coverage/grid/j2d/ColorModelBuilder.java   |  2 +-
 .../sis/coverage/grid/j2d/ColorModelFactory.java   |  4 +-
 .../apache/sis/coverage/grid/j2d/ImageLayout.java  |  4 +-
 .../sis/coverage/grid/j2d/ImageUtilities.java      |  8 +-
 .../sis/coverage/grid/j2d/SampleModelFactory.java  |  2 +-
 .../sis/coverage/grid/j2d/ScaledColorSpace.java    |  2 +-
 .../sis/coverage/grid/j2d/TileErrorHandler.java    |  2 +-
 .../sis/coverage/grid/j2d/TileOpExecutor.java      |  4 +-
 .../sis/coverage/grid/j2d/TilePlaceholder.java     |  4 +-
 .../sis/coverage/internal/CommonDomainFinder.java  |  2 +-
 .../sis/coverage/internal/MultiSourceArgument.java |  2 +-
 .../sis/coverage/internal/RangeArgument.java       |  2 +-
 .../org/apache/sis/feature/AbstractFeature.java    |  2 +-
 .../apache/sis/feature/AbstractIdentifiedType.java |  2 +-
 .../org/apache/sis/feature/CharacteristicMap.java  |  8 +-
 .../apache/sis/feature/CharacteristicTypeMap.java  |  4 +-
 .../org/apache/sis/feature/DefaultFeatureType.java |  4 +-
 .../main/org/apache/sis/feature/DenseFeature.java  |  4 +-
 .../org/apache/sis/feature/EnvelopeOperation.java  |  2 +-
 .../main/org/apache/sis/feature/FeatureFormat.java |  4 +-
 .../apache/sis/feature/MultiValuedAssociation.java |  2 +-
 .../apache/sis/feature/MultiValuedAttribute.java   |  4 +-
 .../org/apache/sis/feature/NamedFeatureType.java   |  2 +-
 .../org/apache/sis/feature/SingletonAttribute.java |  2 +-
 .../main/org/apache/sis/feature/SparseFeature.java |  4 +-
 .../apache/sis/feature/StringJoinOperation.java    |  4 +-
 .../sis/feature/builder/AttributeTypeBuilder.java  |  6 +-
 .../sis/feature/internal/MovingFeatures.java       |  2 +-
 .../apache/sis/filter/DefaultFilterFactory.java    |  2 +-
 .../main/org/apache/sis/filter/LogicalFilter.java  |  4 +-
 .../main/org/apache/sis/filter/Optimization.java   |  2 +-
 .../apache/sis/filter/internal/CopyVisitor.java    |  2 +-
 .../main/org/apache/sis/filter/internal/Node.java  |  2 +-
 .../sis/filter/internal/SortByComparator.java      |  2 +-
 .../apache/sis/filter/sqlmm/FunctionWithSRID.java  |  2 +-
 .../main/org/apache/sis/filter/sqlmm/Registry.java |  2 +-
 .../main/org/apache/sis/filter/sqlmm/ST_Point.java |  2 +-
 .../apache/sis/geometry/wrapper/Geometries.java    |  2 +-
 .../apache/sis/geometry/wrapper/GeometryType.java  |  2 +-
 .../geometry/wrapper/SpatialOperationContext.java  |  2 +-
 .../apache/sis/geometry/wrapper/esri/Factory.java  |  2 +-
 .../apache/sis/geometry/wrapper/j2d/Factory.java   |  2 +-
 .../apache/sis/geometry/wrapper/j2d/Polyline.java  |  2 +-
 .../apache/sis/geometry/wrapper/jts/Factory.java   |  2 +-
 .../sis/geometry/wrapper/jts/FilteringContext.java |  4 +-
 .../org/apache/sis/geometry/wrapper/jts/JTS.java   |  2 +-
 .../main/org/apache/sis/image/AnnotatedImage.java  |  2 +-
 .../apache/sis/image/BandedSampleConverter.java    |  2 +-
 .../main/org/apache/sis/image/ComputedImage.java   |  2 +-
 .../main/org/apache/sis/image/ComputedTiles.java   |  2 +-
 .../main/org/apache/sis/image/DataType.java        |  2 +-
 .../main/org/apache/sis/image/ErrorAction.java     |  2 +-
 .../main/org/apache/sis/image/ImageProcessor.java  |  2 +-
 .../main/org/apache/sis/image/MaskedImage.java     |  6 +-
 .../org/apache/sis/image/MultiSourcePrefetch.java  |  2 +-
 .../main/org/apache/sis/image/PixelIterator.java   |  4 +-
 .../main/org/apache/sis/image/PlanarImage.java     |  2 +-
 .../main/org/apache/sis/image/RecoloredImage.java  |  2 +-
 .../main/org/apache/sis/image/ResampledImage.java  |  2 +-
 .../main/org/apache/sis/image/ResamplingGrid.java  |  2 +-
 .../main/org/apache/sis/image/TileCache.java       |  2 +-
 .../main/org/apache/sis/image/Transferer.java      |  4 +-
 .../sis/image/processing/CompoundFuture.java       |  2 +-
 .../apache/sis/image/processing/TiledProcess.java  |  4 +-
 .../sis/image/processing/isoline/Fragments.java    |  2 +-
 .../org/apache/sis/index/tree/NodeIterator.java    |  2 +-
 .../main/org/apache/sis/index/tree/PointTree.java  |  2 +-
 .../apache/sis/coverage/grid/GridExtentTest.java   |  2 +-
 .../sis/coverage/grid/j2d/ImageUtilitiesTest.java  |  2 +-
 .../apache/sis/feature/FeatureMemoryBenchmark.java |  2 +-
 .../org/apache/sis/filter/TemporalFilterTest.java  |  2 +-
 .../org/apache/sis/image/InterpolationTest.java    |  2 +-
 .../org/apache/sis/image/ResamplingGridTest.java   |  2 +-
 .../apache/sis/image/StatisticsCalculatorTest.java |  2 +-
 .../test/org/apache/sis/image/TiledImageMock.java  |  2 +-
 .../apache/sis/test/feature/FeatureComparator.java |  2 +-
 ... org.apache.sis.util.internal.MetadataServices} |  0
 .../org.apache.sis.metadata/main/module-info.java  |  2 +-
 .../org/apache/sis/metadata/MetadataFormat.java    |  2 +-
 .../org/apache/sis/metadata/MetadataStandard.java  | 10 +--
 .../org/apache/sis/metadata/MetadataVisitor.java   |  4 +-
 .../sis/metadata/MetadataVisitorException.java     |  2 +-
 .../apache/sis/metadata/ModifiableMetadata.java    |  8 +-
 .../org/apache/sis/metadata/PropertyAccessor.java  |  8 +-
 .../main/org/apache/sis/metadata/Pruner.java       |  2 +-
 .../sis/metadata/StandardImplementation.java       |  2 +-
 .../main/org/apache/sis/metadata/StateChanger.java |  6 +-
 .../main/org/apache/sis/metadata/TreeNode.java     |  2 +-
 .../org/apache/sis/metadata/TreeTableView.java     |  6 +-
 .../main/org/apache/sis/metadata/ValueMap.java     |  2 +-
 .../apache/sis/metadata/internal/AxisNames.java    |  2 +-
 .../apache/sis/metadata/internal/Identifiers.java  |  6 +-
 .../metadata/internal/ImplementationHelper.java    |  6 +-
 .../apache/sis/metadata/internal/NameMeaning.java  |  6 +-
 .../sis/metadata/internal/RecordSchemaSIS.java     |  2 +-
 .../sis/metadata/internal/ReferencingServices.java |  8 +-
 .../sis/metadata/internal/ServicesForUtility.java  |  4 +-
 .../sis/metadata/internal/TemporalUtilities.java   |  8 +-
 .../iso/DefaultExtendedElementInformation.java     |  2 +-
 .../apache/sis/metadata/iso/DefaultMetadata.java   |  4 +-
 .../org/apache/sis/metadata/iso/ISOMetadata.java   |  4 +-
 .../sis/metadata/iso/citation/Citations.java       |  8 +-
 .../sis/metadata/iso/citation/DefaultContact.java  |  2 +-
 .../metadata/iso/citation/DefaultTelephone.java    |  2 +-
 .../iso/content/DefaultCoverageDescription.java    |  2 +-
 .../DefaultDigitalTransferOptions.java             |  2 +-
 .../metadata/iso/distribution/DefaultFormat.java   |  2 +-
 .../metadata/iso/distribution/DefaultMedium.java   |  2 +-
 .../apache/sis/metadata/iso/extent/Extents.java    |  2 +-
 .../iso/identification/DefaultCoupledResource.java |  2 +-
 .../DefaultRepresentativeFraction.java             |  2 +-
 .../metadata/iso/identification/OperationName.java |  2 +-
 .../metadata/iso/legacy/LegacyPropertyAdapter.java |  2 +-
 .../apache/sis/metadata/iso/legacy/MediumName.java |  2 +-
 .../maintenance/DefaultMaintenanceInformation.java |  2 +-
 .../iso/maintenance/DefaultScopeDescription.java   |  2 +-
 .../iso/quality/DefaultEvaluationMethod.java       |  4 +-
 .../iso/quality/DefaultMeasureReference.java       |  2 +-
 .../sis/metadata/iso/quality/DefaultScope.java     |  2 +-
 .../sis/metadata/simple/CitationConstant.java      |  4 +-
 .../apache/sis/metadata/simple/SimpleCitation.java |  2 +-
 .../apache/sis/metadata/simple/SimpleDuration.java |  2 +-
 .../apache/sis/metadata/simple/SimpleExtent.java   |  2 +-
 .../apache/sis/metadata/simple/SimpleFormat.java   |  2 +-
 .../metadata/simple/SimpleIdentifiedObject.java    |  2 +-
 .../sis/metadata/simple/SimpleIdentifier.java      |  2 +-
 .../apache/sis/metadata/sql/CachedStatement.java   |  2 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java    |  6 +-
 .../apache/sis/metadata/sql/MetadataFallback.java  |  2 +-
 .../apache/sis/metadata/sql/MetadataSource.java    | 18 ++---
 .../apache/sis/metadata/sql/MetadataWriter.java    |  4 +-
 .../apache/sis/metadata/sql/util/Initializer.java  | 12 +--
 .../sis/metadata/sql/util/LocalDataSource.java     |  8 +-
 .../apache/sis/util/iso/DefaultNameFactory.java    |  2 +-
 .../org/apache/sis/util/iso/DefaultNameSpace.java  |  4 +-
 .../org/apache/sis/util/iso/DefaultRecord.java     |  4 +-
 .../apache/sis/util/iso/DefaultRecordSchema.java   |  4 +-
 .../org/apache/sis/util/iso/DefaultRecordType.java |  2 +-
 .../org/apache/sis/util/iso/DefaultScopedName.java |  2 +-
 .../org/apache/sis/util/iso/RecordDefinition.java  |  2 +-
 .../main/org/apache/sis/util/iso/TypeNames.java    |  2 +-
 .../main/org/apache/sis/util/iso/Types.java        |  4 +-
 .../main/org/apache/sis/xml/MarshallerPool.java    | 10 +--
 .../main/org/apache/sis/xml/NilObjectHandler.java  |  2 +-
 .../main/org/apache/sis/xml/Pooled.java            |  2 +-
 .../org/apache/sis/xml/TransformingWriter.java     |  2 +-
 .../main/org/apache/sis/xml/ValueConverter.java    |  2 +-
 .../main/org/apache/sis/xml/XML.java               |  4 +-
 .../main/org/apache/sis/xml/XPointer.java          |  2 +-
 .../main/org/apache/sis/xml/bind/Context.java      |  4 +-
 .../apache/sis/xml/bind/IdentifierMapAdapter.java  |  4 +-
 .../sis/xml/bind/NonMarshalledAuthority.java       |  4 +-
 .../apache/sis/xml/bind/SpecializedIdentifier.java |  2 +-
 .../org/apache/sis/xml/bind/TypeRegistration.java  | 10 +--
 .../sis/xml/bind/gco/CharSequenceAdapter.java      |  2 +-
 .../org/apache/sis/xml/bind/gco/PropertyType.java  |  2 +-
 .../main/org/apache/sis/xml/bind/gml/Measure.java  |  4 +-
 .../apache/sis/xml/bind/gml/SC_VerticalCRS.java    |  2 +-
 .../org/apache/sis/xml/bind/gml/TimeInstant.java   |  2 +-
 .../org/apache/sis/xml/bind/gml/TimePeriod.java    |  2 +-
 .../sis/xml/bind/gml/UniversalTimeAdapter.java     |  2 +-
 .../main/org/apache/sis/xml/bind/lan/Country.java  |  2 +-
 .../apache/sis/xml/bind/lan/LocaleAndCharset.java  |  4 +-
 .../org/apache/sis/xml/bind/lan/PT_Locale.java     |  2 +-
 .../bind/metadata/replace/ServiceParameter.java    |  2 +-
 .../main/org/apache/sis/xml/util/XmlUtilities.java |  4 +-
 .../sis/metadata/PropertyConsistencyCheck.java     |  2 +-
 .../sis/metadata/iso/citation/CitationsTest.java   |  2 +-
 .../metadata/iso/citation/DefaultCitationTest.java |  2 +-
 .../metadata/iso/citation/HardCodedCitations.java  |  4 +-
 .../sis/metadata/sql/MetadataFallbackVerifier.java |  2 +-
 .../sis/metadata/sql/MetadataWriterTest.java       |  2 +-
 .../sis/metadata/xml/SchemaComplianceTest.java     |  2 +-
 .../apache/sis/test/mock/IdentifiedObjectMock.java |  4 +-
 .../apache/sis/test/xml/DocumentComparator.java    |  2 +-
 .../org/apache/sis/test/xml/PackageVerifier.java   |  2 +-
 .../apache/sis/util/iso/DefaultLocalNameTest.java  |  2 +-
 .../org/apache/sis/util/iso/TypeNamesTest.java     |  2 +-
 .../apache/sis/xml/bind/gml/TimePeriodTest.java    |  2 +-
 .../apache/sis/xml/bind/lan/LanguageCodeTest.java  |  2 +-
 .../apache/sis/internal/map/SymbologyVisitor.java  |  2 +-
 .../coverage/MultiResolutionCoverageLoader.java    |  2 +-
 .../sis/internal/map/coverage/RenderingData.java   |  4 +-
 .../main/org/apache/sis/portrayal/Canvas.java      |  2 +-
 .../org/apache/sis/portrayal/CanvasContext.java    |  2 +-
 .../org/apache/sis/portrayal/CanvasExtent.java     |  2 +-
 .../main/org/apache/sis/portrayal/Observable.java  |  2 +-
 .../referencing/gazetteer/FinalLocationType.java   |  2 +-
 .../referencing/gazetteer/GazetteerFactory.java    |  2 +-
 .../gazetteer/GeohashReferenceSystem.java          |  2 +-
 .../gazetteer/MilitaryGridReferenceSystem.java     |  2 +-
 .../gazetteer/ReferencingByIdentifiers.java        |  4 +-
 .../sis/geometry/AbstractDirectPosition.java       |  2 +-
 .../org/apache/sis/geometry/AbstractEnvelope.java  |  4 +-
 .../org/apache/sis/geometry/CoordinateFormat.java  |  6 +-
 .../main/org/apache/sis/geometry/Envelopes.java    |  4 +-
 .../org/apache/sis/geometry/GeneralEnvelope.java   |  2 +-
 .../main/org/apache/sis/io/wkt/AbstractParser.java |  4 +-
 .../main/org/apache/sis/io/wkt/Colors.java         |  2 +-
 .../main/org/apache/sis/io/wkt/Element.java        |  2 +-
 .../org/apache/sis/io/wkt/FormattableObject.java   |  4 +-
 .../main/org/apache/sis/io/wkt/Formatter.java      | 14 ++--
 .../apache/sis/io/wkt/GeodeticObjectParser.java    |  6 +-
 .../org/apache/sis/io/wkt/MathTransformParser.java |  2 +-
 .../main/org/apache/sis/io/wkt/WKTDictionary.java  |  6 +-
 .../main/org/apache/sis/io/wkt/WKTFormat.java      |  6 +-
 .../sis/parameter/DefaultParameterDescriptor.java  |  2 +-
 .../parameter/DefaultParameterDescriptorGroup.java |  2 +-
 .../sis/parameter/DefaultParameterValue.java       |  4 +-
 .../apache/sis/parameter/FilteredParameters.java   |  2 +-
 .../sis/parameter/MapProjectionDescriptor.java     |  2 +-
 .../sis/parameter/MapProjectionParameters.java     |  2 +-
 .../org/apache/sis/parameter/MatrixParameters.java |  2 +-
 .../sis/parameter/MatrixParametersAlphaNum.java    |  4 +-
 .../org/apache/sis/parameter/ParameterFormat.java  |  4 +-
 .../apache/sis/parameter/ParameterTableRow.java    |  6 +-
 .../org/apache/sis/parameter/TensorParameters.java |  2 +-
 .../org/apache/sis/parameter/TensorValues.java     |  6 +-
 .../sis/parameter/UninitializedParameter.java      |  2 +-
 .../sis/parameter/UnmodifiableParameterValue.java  |  2 +-
 .../parameter/UnmodifiableParameterValueGroup.java |  2 +-
 .../main/org/apache/sis/parameter/Verifier.java    |  4 +-
 .../sis/referencing/AbstractIdentifiedObject.java  | 12 +--
 .../apache/sis/referencing/AuthorityFactories.java |  8 +-
 .../main/org/apache/sis/referencing/CRS.java       |  6 +-
 .../main/org/apache/sis/referencing/CommonCRS.java |  8 +-
 .../sis/referencing/EPSGFactoryFallback.java       |  8 +-
 .../apache/sis/referencing/GeodeticCalculator.java |  4 +-
 .../apache/sis/referencing/IdentifiedObjects.java  |  8 +-
 .../sis/referencing/ImmutableIdentifier.java       |  2 +-
 .../org/apache/sis/referencing/NameIterator.java   |  4 +-
 .../org/apache/sis/referencing/Properties.java     |  2 +-
 .../sis/referencing/PropertiesConverter.java       |  2 +-
 .../sis/referencing/StandardDefinitions.java       |  4 +-
 .../sis/referencing/crs/AbstractDerivedCRS.java    |  2 +-
 .../sis/referencing/crs/DefaultCompoundCRS.java    |  2 +-
 .../sis/referencing/crs/DefaultGeographicCRS.java  | 10 +--
 .../sis/referencing/crs/DefaultTemporalCRS.java    |  4 +-
 .../sis/referencing/crs/ExplicitParameters.java    |  2 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  |  4 +-
 .../main/org/apache/sis/referencing/cs/Codes.java  |  4 +-
 .../sis/referencing/cs/CoordinateSystems.java      |  2 +-
 .../sis/referencing/cs/DefaultCompoundCS.java      |  2 +-
 .../sis/referencing/cs/DirectionAlongMeridian.java |  2 +-
 .../org/apache/sis/referencing/cs/Normalizer.java  |  2 +-
 .../sis/referencing/datum/BursaWolfParameters.java |  2 +-
 .../sis/referencing/datum/DatumShiftGrid.java      |  4 +-
 .../sis/referencing/datum/DefaultEllipsoid.java    |  4 +-
 .../referencing/datum/DefaultGeodeticDatum.java    |  4 +-
 .../referencing/datum/DefaultPrimeMeridian.java    |  2 +-
 .../sis/referencing/datum/TimeDependentBWP.java    |  2 +-
 .../factory/AuthorityFactoryIdentifier.java        |  4 +-
 .../referencing/factory/AuthorityFactoryProxy.java |  2 +-
 .../referencing/factory/CommonAuthorityCode.java   |  2 +-
 .../factory/CommonAuthorityFactory.java            |  2 +-
 .../factory/ConcurrentAuthorityFactory.java        | 14 ++--
 .../sis/referencing/factory/FilteredCodes.java     |  2 +-
 .../factory/GeodeticAuthorityFactory.java          |  4 +-
 .../referencing/factory/GeodeticObjectFactory.java |  4 +-
 .../factory/IdentifiedObjectFinder.java            |  4 +-
 .../factory/LazySynchronizedIterator.java          |  2 +-
 .../factory/MultiAuthoritiesFactory.java           | 10 +--
 .../sis/referencing/factory/ReferenceKeeper.java   |  8 +-
 .../referencing/factory/sql/AuthorityCodes.java    |  2 +-
 .../factory/sql/CloseableReference.java            |  2 +-
 .../referencing/factory/sql/EPSGCodeFinder.java    |  2 +-
 .../referencing/factory/sql/EPSGDataAccess.java    | 16 ++--
 .../sis/referencing/factory/sql/EPSGFactory.java   |  2 +-
 .../sis/referencing/factory/sql/EPSGInstaller.java |  6 +-
 .../factory/sql/InstallationScriptProvider.java    |  8 +-
 .../sis/referencing/factory/sql/SQLTranslator.java |  2 +-
 .../sis/referencing/internal/AnnotatedMatrix.java  |  2 +-
 .../sis/referencing/internal/Arithmetic.java       |  4 +-
 .../sis/referencing/internal/DatabaseListener.java |  2 +-
 .../referencing/internal/EPSGParameterDomain.java  |  2 +-
 .../sis/referencing/internal/MergedProperties.java |  2 +-
 .../referencing/internal/ServicesForMetadata.java  |  4 +-
 .../operation/AbstractCoordinateOperation.java     | 10 +--
 .../apache/sis/referencing/operation/CRSPair.java  |  2 +-
 .../operation/CoordinateOperationContext.java      |  2 +-
 .../operation/CoordinateOperationFinder.java       |  4 +-
 .../operation/CoordinateOperationRegistry.java     |  2 +-
 .../operation/DefaultConcatenatedOperation.java    |  2 +-
 .../DefaultCoordinateOperationFactory.java         |  4 +-
 .../operation/builder/LinearTransformBuilder.java  |  6 +-
 .../operation/builder/LocalizationGridBuilder.java |  6 +-
 .../operation/builder/ResidualGrid.java            |  4 +-
 .../operation/matrix/GeneralMatrix.java            |  4 +-
 .../sis/referencing/operation/matrix/Matrices.java |  4 +-
 .../sis/referencing/operation/matrix/Matrix1.java  |  2 +-
 .../sis/referencing/operation/matrix/Matrix2.java  |  2 +-
 .../referencing/operation/matrix/MatrixSIS.java    |  2 +-
 .../operation/projection/AlbersEqualArea.java      |  2 +-
 .../operation/projection/CylindricalEqualArea.java |  2 +-
 .../operation/projection/Initializer.java          |  4 +-
 .../projection/LambertAzimuthalEqualArea.java      |  2 +-
 .../projection/LambertConicConformal.java          |  2 +-
 .../operation/projection/LongitudeWraparound.java  |  4 +-
 .../referencing/operation/projection/Mercator.java |  2 +-
 .../operation/projection/NormalizedProjection.java |  8 +-
 .../operation/projection/PolarStereographic.java   |  2 +-
 .../operation/projection/TransverseMercator.java   |  2 +-
 .../operation/projection/ZonedGridSystem.java      |  2 +-
 .../operation/provider/AbstractProvider.java       |  4 +-
 .../sis/referencing/operation/provider/Affine.java |  4 +-
 .../provider/DatumShiftGridCompressed.java         |  2 +-
 .../operation/provider/DatumShiftGridGroup.java    |  2 +-
 .../operation/provider/DatumShiftGridLoader.java   |  2 +-
 .../referencing/operation/provider/EPSGName.java   |  2 +-
 .../operation/provider/Equirectangular.java        |  4 +-
 .../provider/FranceGeocentricInterpolation.java    |  2 +-
 .../GeocentricAffineBetweenGeographic.java         |  2 +-
 .../provider/GeocentricToTopocentric.java          |  2 +-
 .../operation/provider/Geographic2Dto3D.java       |  2 +-
 .../operation/provider/GeographicRedimension.java  |  2 +-
 .../operation/provider/GeographicToGeocentric.java |  2 +-
 .../operation/provider/Interpolation1D.java        |  2 +-
 .../operation/provider/LambertConformal2SP.java    |  2 +-
 .../operation/provider/MapProjection.java          |  2 +-
 .../operation/provider/Mercator1SP.java            |  2 +-
 .../operation/provider/MillerCylindrical.java      |  2 +-
 .../referencing/operation/provider/Molodensky.java |  2 +-
 .../provider/MolodenskyInterpolation.java          |  2 +-
 .../sis/referencing/operation/provider/NTv2.java   |  2 +-
 .../operation/provider/PolarStereographicA.java    |  4 +-
 .../operation/provider/SatelliteTracking.java      |  2 +-
 .../referencing/operation/provider/Sinusoidal.java |  2 +-
 .../operation/provider/TransverseMercator.java     |  4 +-
 .../transform/AbstractLinearTransform.java         |  2 +-
 .../operation/transform/AbstractMathTransform.java |  2 +-
 .../operation/transform/CartesianToPolar.java      |  2 +-
 .../operation/transform/ConcatenatedTransform.java |  4 +-
 .../operation/transform/ContextualParameter.java   |  2 +-
 .../operation/transform/ContextualParameters.java  |  4 +-
 .../transform/CoordinateSystemTransform.java       |  2 +-
 .../transform/DefaultMathTransformFactory.java     |  8 +-
 .../transform/EllipsoidToCentricTransform.java     |  6 +-
 .../transform/ExponentialTransform1D.java          |  2 +-
 .../transform/InterpolatedGeocentricTransform.java |  2 +-
 .../transform/InterpolatedMolodenskyTransform.java |  2 +-
 .../operation/transform/LinearInterpolator1D.java  |  2 +-
 .../operation/transform/LinearTransform1D.java     |  2 +-
 .../transform/LogarithmicTransform1D.java          |  2 +-
 .../operation/transform/MathTransforms.java        |  2 +-
 .../operation/transform/MolodenskyFormula.java     |  2 +-
 .../operation/transform/OperationMethodSet.java    |  2 +-
 .../operation/transform/PassThroughTransform.java  |  2 +-
 .../operation/transform/PolarToCartesian.java      |  2 +-
 .../operation/transform/PoleRotation.java          |  4 +-
 .../operation/transform/PowerTransform1D.java      |  2 +-
 .../operation/transform/ProjectiveTransform.java   |  2 +-
 .../operation/transform/TransformSeparator.java    |  2 +-
 .../operation/transform/WraparoundTransform.java   |  2 +-
 .../apache/sis/referencing/util/AxesMapper.java    |  2 +-
 .../sis/referencing/util/CoordinateOperations.java |  4 +-
 .../org/apache/sis/referencing/util/Formulas.java  |  8 +-
 .../org/apache/sis/referencing/util/LazySet.java   |  2 +-
 .../util/PositionalAccuracyConstant.java           |  2 +-
 .../util/ReferencingFactoryContainer.java          |  2 +-
 .../apache/sis/referencing/util/WKTUtilities.java  |  6 +-
 .../sis/referencing/util/WraparoundApplicator.java |  2 +-
 .../sis/referencing/util/j2d/AffineMatrix.java     |  2 +-
 .../referencing/util/j2d/IntervalRectangle.java    |  2 +-
 .../referencing/util/j2d/ParameterizedAffine.java  |  2 +-
 .../referencing/CC_GeneralOperationParameter.java  |  2 +-
 .../sis/xml/bind/referencing/CS_AxisDirection.java |  2 +-
 .../sis/xml/bind/referencing/CS_RangeMeaning.java  |  2 +-
 .../org/apache/sis/xml/bind/referencing/Code.java  |  4 +-
 .../test/org/apache/sis/io/wkt/FormatterTest.java  |  2 +-
 .../sis/io/wkt/GeodeticObjectParserTest.java       |  2 +-
 .../DefaultParameterDescriptorGroupTest.java       |  2 +-
 .../parameter/DefaultParameterDescriptorTest.java  |  2 +-
 .../sis/parameter/DefaultParameterValueTest.java   |  2 +-
 .../sis/parameter/MapProjectionParametersTest.java | 18 ++---
 .../apache/sis/parameter/TensorParametersTest.java |  4 +-
 .../org/apache/sis/parameter/TensorValuesTest.java |  6 +-
 .../org/apache/sis/referencing/Assertions.java     |  2 +-
 .../sis/referencing/AuthorityFactoriesTest.java    |  4 +-
 .../test/org/apache/sis/referencing/CRSTest.java   |  2 +-
 .../org/apache/sis/referencing/CommonCRSTest.java  |  2 +-
 .../sis/referencing/ImmutableIdentifierTest.java   |  2 +-
 .../sis/referencing/StandardDefinitionsTest.java   |  2 +-
 .../referencing/crs/DefaultProjectedCRSTest.java   |  4 +-
 .../referencing/crs/DefaultTemporalCRSTest.java    |  4 +-
 .../datum/DefaultTemporalDatumTest.java            |  2 +-
 .../sis/referencing/datum/HardCodedDatum.java      |  2 +-
 .../factory/CommonAuthorityFactoryTest.java        |  2 +-
 .../factory/MultiAuthoritiesFactoryTest.java       |  2 +-
 .../sis/referencing/factory/TestFactorySource.java |  2 +-
 .../referencing/factory/sql/EPSGFactoryTest.java   |  2 +-
 .../referencing/factory/sql/EPSGInstallerTest.java |  4 +-
 .../factory/sql/epsg/DataScriptFormatter.java      |  2 +-
 .../DefaultCoordinateOperationFactoryTest.java     |  2 +-
 .../operation/matrix/GeneralMatrixTest.java        |  2 +-
 .../referencing/operation/matrix/MatricesTest.java |  2 +-
 .../operation/matrix/MatrixTestCase.java           |  2 +-
 .../projection/AuthalicConversionTest.java         |  2 +-
 .../operation/projection/Benchmark.java            |  4 +-
 .../projection/ConformalProjectionTest.java        |  2 +-
 .../projection/MapProjectionTestCase.java          |  2 +-
 .../projection/MercatorMethodComparison.java       |  2 +-
 .../operation/projection/MercatorTest.java         |  2 +-
 .../sis/referencing/operation/projection/NoOp.java |  2 +-
 .../operation/projection/ZonedGridSystemTest.java  |  2 +-
 .../operation/provider/MapProjectionTest.java      |  2 +-
 .../referencing/operation/provider/NTv2Test.java   |  2 +-
 .../operation/provider/TransverseMercatorTest.java |  2 +-
 .../transform/DefaultMathTransformFactoryTest.java |  2 +-
 .../transform/OperationMethodSetTest.java          |  2 +-
 .../transform/ProjectiveTransformTest.java         |  2 +-
 .../operation/transform/ScaleTransformTest.java    |  2 +-
 .../transform/TranslationTransformTest.java        |  2 +-
 .../report/CoordinateOperationMethods.java         |  4 +-
 .../report/CoordinateReferenceSystems.java         |  2 +-
 .../sis/referencing/report/HTMLGenerator.java      |  2 +-
 .../sis/test/integration/ConsistencyTest.java      |  2 +-
 .../sis/test/integration/DatumShiftTest.java       |  2 +-
 .../apache/sis/test/integration/MetadataTest.java  |  4 +-
 .../sis/test/integration/MetadataVerticalTest.java |  2 +-
 .../CC_GeneralOperationParameterTest.java          |  2 +-
 .../CC_OperationParameterGroupTest.java            |  2 +-
 .../apache/sis/xml/bind/referencing/CodeTest.java  |  2 +-
 .../main/org/apache/sis/storage/landsat/Band.java  |  2 +-
 .../org/apache/sis/storage/landsat/BandGroup.java  |  2 +-
 .../apache/sis/storage/landsat/LandsatStore.java   |  2 +-
 .../apache/sis/storage/landsat/MetadataReader.java |  8 +-
 .../org/apache/sis/storage/geotiff/CRSBuilder.java |  6 +-
 .../org/apache/sis/storage/geotiff/DataSubset.java |  4 +-
 .../apache/sis/storage/geotiff/GeoTiffStore.java   |  4 +-
 .../sis/storage/geotiff/GeoTiffStoreProvider.java  |  2 +-
 .../sis/storage/geotiff/GridGeometryBuilder.java   |  2 +-
 .../sis/storage/geotiff/ImageFileDirectory.java    |  6 +-
 .../main/org/apache/sis/storage/geotiff/Type.java  |  2 +-
 .../apache/sis/storage/geotiff/XMLMetadata.java    |  2 +-
 .../geotiff/inflater/CompressionChannel.java       |  2 +-
 .../geotiff/inflater/HorizontalPredictor.java      |  2 +-
 .../sis/storage/geotiff/inflater/Inflater.java     |  4 +-
 .../storage/geotiff/inflater/PredictorChannel.java |  2 +-
 .../apache/sis/storage/netcdf/MetadataReader.java  |  8 +-
 .../org/apache/sis/storage/netcdf/NetcdfStore.java |  4 +-
 .../sis/storage/netcdf/NetcdfStoreProvider.java    |  4 +-
 .../org/apache/sis/storage/netcdf/base/Axis.java   |  2 +-
 .../apache/sis/storage/netcdf/base/Convention.java |  2 +-
 .../apache/sis/storage/netcdf/base/Decoder.java    |  4 +-
 .../apache/sis/storage/netcdf/base/FeatureSet.java |  4 +-
 .../sis/storage/netcdf/base/GridCacheKey.java      |  2 +-
 .../sis/storage/netcdf/base/GridMapping.java       |  4 +-
 .../org/apache/sis/storage/netcdf/base/HYCOM.java  |  2 +-
 .../apache/sis/storage/netcdf/base/Linearizer.java |  2 +-
 .../sis/storage/netcdf/base/NamedElement.java      |  4 +-
 .../org/apache/sis/storage/netcdf/base/Node.java   |  2 +-
 .../sis/storage/netcdf/base/RasterResource.java    |  4 +-
 .../apache/sis/storage/netcdf/base/Variable.java   |  6 +-
 .../sis/storage/netcdf/classic/ChannelDecoder.java |  6 +-
 .../sis/storage/netcdf/classic/GridInfo.java       |  2 +-
 .../sis/storage/netcdf/classic/VariableInfo.java   |  4 +-
 .../sis/storage/netcdf/ucar/DimensionWrapper.java  |  2 +-
 .../sis/storage/netcdf/ucar/GridWrapper.java       |  2 +-
 .../sis/storage/netcdf/ucar/VariableWrapper.java   |  2 +-
 .../main/org/apache/sis/storage/sql/SQLStore.java  |  2 +-
 .../sis/storage/sql/feature/BinaryEncoding.java    |  2 +-
 .../org/apache/sis/storage/sql/feature/Column.java |  2 +-
 .../apache/sis/storage/sql/feature/Database.java   |  4 +-
 .../sis/storage/sql/feature/FeatureAnalyzer.java   |  2 +-
 .../sis/storage/sql/feature/FeatureStream.java     |  2 +-
 .../sis/storage/sql/feature/InfoStatements.java    |  4 +-
 .../apache/sis/storage/sql/feature/PrimaryKey.java |  4 +-
 .../sis/storage/sql/feature/QueryAnalyzer.java     |  2 +-
 .../apache/sis/storage/sql/feature/Relation.java   |  2 +-
 .../sis/storage/sql/feature/TableAnalyzer.java     |  2 +-
 .../sis/storage/sql/feature/TableReference.java    |  2 +-
 .../sis/storage/sql/feature/ValueGetter.java       |  4 +-
 .../sis/storage/sql/postgis/RasterReader.java      |  4 +-
 .../main/org/apache/sis/storage/gpx/Metadata.java  |  2 +-
 .../sis/storage/xml/stream/StaxDataStore.java      |  6 +-
 .../sis/storage/xml/stream/StaxStreamReader.java   |  4 +-
 .../apache/sis/io/stream/ChannelDataOutput.java    |  2 +-
 .../org/apache/sis/io/stream/ChannelFactory.java   |  2 +-
 .../apache/sis/io/stream/FileCacheByteChannel.java |  8 +-
 .../main/org/apache/sis/io/stream/IOUtilities.java |  2 +-
 .../main/org/apache/sis/io/stream/Region.java      |  2 +-
 .../sis/storage/AbstractGridCoverageResource.java  |  2 +-
 .../org/apache/sis/storage/CoverageSubset.java     |  2 +-
 .../main/org/apache/sis/storage/DataStore.java     |  2 +-
 .../org/apache/sis/storage/DataStoreRegistry.java  |  6 +-
 .../main/org/apache/sis/storage/FeatureNaming.java |  2 +-
 .../main/org/apache/sis/storage/ProbeResult.java   |  2 +-
 .../org/apache/sis/storage/StorageConnector.java   |  4 +-
 .../aggregate/BandAggregateGridResource.java       |  2 +-
 .../storage/aggregate/ConcatenatedFeatureSet.java  |  4 +-
 .../aggregate/ConcatenatedGridCoverage.java        |  2 +-
 .../aggregate/ConcatenatedGridResource.java        |  4 +-
 .../sis/storage/aggregate/DimensionSelector.java   |  2 +-
 .../apache/sis/storage/aggregate/GridSlice.java    |  2 +-
 .../org/apache/sis/storage/aggregate/Group.java    |  2 +-
 .../sis/storage/aggregate/GroupAggregate.java      |  4 +-
 .../sis/storage/aggregate/MergeStrategy.java       |  2 +-
 .../main/org/apache/sis/storage/base/CodeType.java |  4 +-
 .../sis/storage/base/DocumentedStoreProvider.java  |  2 +-
 .../apache/sis/storage/base/MetadataBuilder.java   |  6 +-
 .../apache/sis/storage/base/ResourceLineage.java   |  4 +-
 .../apache/sis/storage/base/StoreUtilities.java    |  4 +-
 .../apache/sis/storage/base/TiledGridCoverage.java |  2 +-
 .../org/apache/sis/storage/csv/GeometryParser.java |  2 +-
 .../sis/storage/csv/MovingFeatureBuilder.java      |  2 +-
 .../main/org/apache/sis/storage/csv/Store.java     |  6 +-
 .../org/apache/sis/storage/csv/TimeEncoding.java   |  4 +-
 .../apache/sis/storage/esri/CharactersView.java    |  2 +-
 .../org/apache/sis/storage/esri/RasterStore.java   |  4 +-
 .../apache/sis/storage/esri/RawRasterReader.java   |  4 +-
 .../apache/sis/storage/esri/RawRasterStore.java    |  4 +-
 .../apache/sis/storage/event/StoreListeners.java   |  2 +-
 .../sis/storage/folder/ConcurrentCloser.java       |  2 +-
 .../main/org/apache/sis/storage/folder/Store.java  |  2 +-
 .../sis/storage/image/WorldFileResource.java       |  2 +-
 .../apache/sis/storage/image/WorldFileStore.java   |  2 +-
 .../org/apache/sis/storage/wkt/StoreFormat.java    |  2 +-
 .../main/org/apache/sis/storage/xml/Store.java     |  2 +-
 .../sis/test/storage/CoverageReadConsistency.java  |  4 +-
 .../apache/sis/test/storage/SubsampledImage.java   |  2 +-
 .../services/org.apache.sis.util.ObjectConverter   | 80 +++++++++----------
 .../src/org.apache.sis.util/main/module-info.java  | 92 +++++++++++-----------
 .../{internal => }/converter/AngleConverter.java   |  2 +-
 .../{internal => }/converter/ArrayConverter.java   |  2 +-
 .../converter/CharSequenceConverter.java           |  2 +-
 .../sis/{internal => }/converter/ClassPair.java    |  2 +-
 .../converter/CollectionConverter.java             |  2 +-
 .../sis/{internal => }/converter/Column.java       |  2 +-
 .../converter/ConverterRegistry.java               |  2 +-
 .../{internal => }/converter/DateConverter.java    |  2 +-
 .../converter/FallbackConverter.java               |  2 +-
 .../converter/FractionConverter.java               |  2 +-
 .../converter/IdentityConverter.java               |  2 +-
 .../{internal => }/converter/NumberConverter.java  |  2 +-
 .../{internal => }/converter/ObjectToString.java   |  6 +-
 .../{internal => }/converter/PathConverter.java    |  2 +-
 .../{internal => }/converter/StringConverter.java  |  6 +-
 .../converter/SurjectiveConverter.java             |  2 +-
 .../{internal => }/converter/SystemConverter.java  |  4 +-
 .../{internal => }/converter/SystemRegistry.java   |  8 +-
 .../sis/{internal => }/converter/package-info.java |  6 +-
 .../sis/internal/system/Descriptions_fr.properties |  7 --
 .../main/org/apache/sis/io/CompoundFormat.java     |  6 +-
 .../main/org/apache/sis/io/DefaultFormat.java      |  2 +-
 .../org/apache/sis/io/IdentifiedObjectFormat.java  |  4 +-
 .../main/org/apache/sis/io/LineAppender.java       |  2 +-
 .../main/org/apache/sis/io/TableAppender.java      |  2 +-
 .../main/org/apache/sis/math/ArrayVector.java      |  2 +-
 .../main/org/apache/sis/math/DecimalFunctions.java |  4 +-
 .../main/org/apache/sis/math/Fraction.java         |  2 +-
 .../main/org/apache/sis/math/Line.java             |  6 +-
 .../org/apache/sis/math/LinearlyDerivedVector.java |  2 +-
 .../main/org/apache/sis/math/MathFunctions.java    |  6 +-
 .../main/org/apache/sis/math/Plane.java            |  6 +-
 .../main/org/apache/sis/math/Statistics.java       |  4 +-
 .../main/org/apache/sis/math/StatisticsFormat.java |  2 +-
 .../main/org/apache/sis/math/Vector.java           |  4 +-
 .../main/org/apache/sis/measure/AbstractUnit.java  |  4 +-
 .../main/org/apache/sis/measure/Angle.java         |  2 +-
 .../main/org/apache/sis/measure/AngleFormat.java   |  4 +-
 .../sis/measure/FormattedCharacterIterator.java    |  4 +-
 .../org/apache/sis/measure/LinearConverter.java    |  4 +-
 .../main/org/apache/sis/measure/NumberRange.java   |  2 +-
 .../main/org/apache/sis/measure/Prefixes.java      |  2 +-
 .../main/org/apache/sis/measure/Range.java         |  4 +-
 .../main/org/apache/sis/measure/RangeFormat.java   |  6 +-
 .../main/org/apache/sis/measure/Scalar.java        |  2 +-
 .../apache/sis/measure/SexagesimalConverter.java   |  2 +-
 .../main/org/apache/sis/measure/SystemUnit.java    |  2 +-
 .../main/org/apache/sis/measure/UnitDimension.java |  4 +-
 .../main/org/apache/sis/measure/UnitFormat.java    |  6 +-
 .../main/org/apache/sis/measure/UnitServices.java  |  2 +-
 .../main/org/apache/sis/measure/Units.java         |  2 +-
 .../{internal/jdk17 => pending/jdk}/HexFormat.java |  2 +-
 .../sis/{internal/jdk17 => pending/jdk}/JDK17.java |  4 +-
 .../{internal/jdk17 => pending/jdk}/Record.java    |  2 +-
 .../jdk17 => pending/jdk}/package-info.java        |  2 +-
 .../temporal/DefaultInstant.java                   |  2 +-
 .../temporal/DefaultPeriod.java                    |  2 +-
 .../temporal/DefaultPeriodDuration.java            |  2 +-
 .../temporal/DefaultTemporalFactory.java           |  2 +-
 .../{internal => pending}/temporal/Primitive.java  |  2 +-
 .../temporal/package-info.java                     |  2 +-
 .../main/org/apache/sis/setup/About.java           | 14 ++--
 .../main/org/apache/sis/setup/Configuration.java   |  2 +-
 .../apache/sis/setup/InstallationResources.java    |  8 +-
 .../main/org/apache/sis/setup/OptionKey.java       |  2 +-
 .../apache/sis/setup/OptionalInstallations.java    |  6 +-
 .../sis/{internal => }/system/CommonExecutor.java  |  2 +-
 .../sis/{internal => }/system/Configuration.java   |  2 +-
 .../sis/{internal => }/system/DaemonThread.java    |  2 +-
 .../sis/{internal => }/system/DataDirectory.java   |  2 +-
 .../sis/{internal => }/system/DelayedExecutor.java |  2 +-
 .../sis/{internal => }/system/DelayedRunnable.java |  2 +-
 .../{internal => }/system/Descriptions.properties  |  2 +-
 .../apache/sis/system/Descriptions_fr.properties   |  7 ++
 .../apache/sis/{internal => }/system/Fallback.java |  2 +-
 .../system/LocalizedStaticObject.java              |  2 +-
 .../apache/sis/{internal => }/system/Loggers.java  |  2 +-
 .../apache/sis/{internal => }/system/Modules.java  |  2 +-
 .../{internal => }/system/OptionalDependency.java  |  2 +-
 .../system/ReferenceQueueConsumer.java             |  2 +-
 .../apache/sis/{internal => }/system/Reflect.java  |  2 +-
 .../sis/{internal => }/system/Semaphores.java      |  2 +-
 .../apache/sis/{internal => }/system/Shutdown.java |  2 +-
 .../sis/{internal => }/system/Supervisor.java      |  4 +-
 .../sis/{internal => }/system/SupervisorMBean.java |  2 +-
 .../sis/{internal => }/system/SystemListener.java  |  2 +-
 .../apache/sis/{internal => }/system/Threads.java  |  2 +-
 .../sis/{internal => }/system/package-info.java    |  2 +-
 .../sis/util/AbstractInternationalString.java      |  2 +-
 .../main/org/apache/sis/util/ArgumentChecks.java   |  2 +-
 .../main/org/apache/sis/util/Characters.java       |  4 +-
 .../main/org/apache/sis/util/Classes.java          |  2 +-
 .../main/org/apache/sis/util/Numbers.java          |  4 +-
 .../main/org/apache/sis/util/ObjectConverters.java |  4 +-
 .../main/org/apache/sis/util/Version.java          |  4 +-
 .../main/org/apache/sis/util/collection/Cache.java |  6 +-
 .../apache/sis/util/collection/CodeListSet.java    |  4 +-
 .../org/apache/sis/util/collection/Containers.java |  2 +-
 .../sis/util/collection/DefaultTreeTable.java      |  6 +-
 .../org/apache/sis/util/collection/DerivedSet.java |  2 +-
 .../apache/sis/util/collection/IntegerList.java    |  2 +-
 .../sis/util/collection/TreeTableFormat.java       |  8 +-
 .../org/apache/sis/util/collection/WeakEntry.java  |  4 +-
 .../apache/sis/util/collection/WeakHashSet.java    |  2 +-
 .../sis/util/collection/WeakValueHashMap.java      |  2 +-
 .../util => util/internal}/AbstractIterator.java   |  2 +-
 .../util => util/internal}/AbstractMap.java        |  2 +-
 .../util => util/internal}/AbstractMapEntry.java   |  2 +-
 .../{internal/util => util/internal}/Acyclic.java  |  2 +-
 .../internal}/ArgumentCheckByAssertion.java        |  2 +-
 .../util => util/internal}/AutoMessageFormat.java  |  2 +-
 .../sis/{internal/util => util/internal}/Bag.java  |  2 +-
 .../util => util/internal}/CheckedArrayList.java   |  2 +-
 .../util => util/internal}/CheckedHashSet.java     |  2 +-
 .../util => util/internal}/CloneAccess.java        |  2 +-
 .../{internal/util => util/internal}/Cloner.java   |  2 +-
 .../util => util/internal}/CodeLists.java          |  2 +-
 .../util => util/internal}/CollectionsExt.java     |  2 +-
 .../util => util/internal}/Constants.java          |  2 +-
 .../util => util/internal}/DefinitionURI.java      |  4 +-
 .../util => util/internal}/DoubleDouble.java       |  4 +-
 .../util => util/internal}/EmptyQueue.java         |  2 +-
 .../util => util/internal}/ListOfUnknownSize.java  |  2 +-
 .../internal}/LocalizedParseException.java         |  2 +-
 .../util => util/internal}/MetadataServices.java   |  8 +-
 .../{internal/util => util/internal}/Numerics.java |  4 +-
 .../util => util/internal}/PropertyFormat.java     |  2 +-
 .../util => util/internal}/SetOfUnknownSize.java   |  2 +-
 .../internal}/SimpleCharacterIterator.java         |  2 +-
 .../util => util/internal}/StandardDateFormat.java |  2 +-
 .../{internal/util => util/internal}/Strings.java  |  2 +-
 .../internal}/TreeFormatCustomization.java         |  2 +-
 .../sis/{internal/util => util/internal}/URLs.java |  2 +-
 .../internal}/UnmodifiableArrayList.java           |  2 +-
 .../sis/{internal/util => util/internal}/X364.java |  2 +-
 .../util => util/internal}/package-info.java       |  2 +-
 .../main/org/apache/sis/util/logging/Logging.java  |  4 +-
 .../apache/sis/util/logging/MonolineFormatter.java | 12 +--
 .../apache/sis/util/logging/PerformanceLevel.java  |  2 +-
 .../sis/util/resources/IndexedResourceBundle.java  | 10 +--
 .../converter/AngleConverterTest.java              |  2 +-
 .../converter/ArrayConverterTest.java              |  2 +-
 .../converter/ConverterRegistryTest.java           |  2 +-
 .../converter/FallbackConverterTest.java           |  2 +-
 .../converter/NumberConverterTest.java             |  2 +-
 .../converter/PathConverterTest.java               |  2 +-
 .../converter/StringConverterTest.java             |  2 +-
 .../converter/SystemRegistryTest.java              |  4 +-
 .../test/org/apache/sis/io/LineAppenderTest.java   |  2 +-
 .../test/org/apache/sis/io/TableAppenderTest.java  |  2 +-
 .../test/org/apache/sis/io/WordWrapTest.java       |  2 +-
 .../org/apache/sis/math/DecimalFunctionsTest.java  |  2 +-
 .../test/org/apache/sis/math/LineTest.java         |  2 +-
 .../org/apache/sis/math/MathFunctionsTest.java     |  4 +-
 .../test/org/apache/sis/math/PlaneTest.java        |  2 +-
 .../measure/FormattedCharacterIteratorTest.java    |  2 +-
 .../org/apache/sis/measure/RangeFormatTest.java    |  2 +-
 .../test/org/apache/sis/measure/UnitsTest.java     |  2 +-
 .../sis/{internal => }/system/LoggersTest.java     |  2 +-
 .../system/ReferenceQueueConsumerTest.java         |  2 +-
 .../test/org/apache/sis/test/Assume.java           |  2 +-
 .../org/apache/sis/test/LogRecordCollector.java    |  2 +-
 .../test/org/apache/sis/test/OptionalTestData.java |  2 +-
 .../test/org/apache/sis/test/TestCase.java         |  2 +-
 .../test/org/apache/sis/test/TestUtilities.java    |  4 +-
 .../{internal/test => test/self}/AssertTest.java   |  2 +-
 .../test => test/self}/TestUtilitiesTest.java      |  2 +-
 .../{internal/test => test/self}/package-info.java |  2 +-
 .../org/apache/sis/util/collection/CacheTest.java  |  2 +-
 .../apache/sis/util/collection/RangeSetTest.java   |  4 +-
 .../util => util/internal}/AbstractMapTest.java    |  2 +-
 .../{internal/util => util/internal}/BagTest.java  |  2 +-
 .../internal}/CheckedArrayListTest.java            |  2 +-
 .../util => util/internal}/CollectionsExtTest.java |  2 +-
 .../util => util/internal}/DefinitionURITest.java  |  2 +-
 .../util => util/internal}/DoubleDoubleTest.java   |  2 +-
 .../internal}/ListOfUnknownSizeTest.java           |  2 +-
 .../internal}/LocalizedParseExceptionTest.java     |  2 +-
 .../util => util/internal}/NumericsTest.java       |  4 +-
 .../internal}/StandardDateFormatTest.java          |  2 +-
 .../util => util/internal}/StringsTest.java        |  2 +-
 .../{internal/util => util/internal}/X364Test.java |  4 +-
 .../sis/util/logging/MonolineFormatterTest.java    |  2 +-
 .../main/org/apache/sis/cql/CQL.java               |  2 +-
 .../org/apache/sis/cql/FilterToCQLVisitor.java     |  2 +-
 .../test/org/apache/sis/cql/FilterReadingTest.java |  2 +-
 .../test/org/apache/sis/cql/FilterWritingTest.java |  2 +-
 .../sis/storage/shapefile/InputFeatureStream.java  |  2 +-
 .../storage/shapefile/internal/AutoChecker.java    |  2 +-
 .../sis/storage/shapefile/jdbc/DBFDriver.java      |  2 +-
 .../org/apache/sis/services/OSGiActivator.java     |  4 +-
 .../org/apache/sis/services/ServletListener.java   |  2 +-
 .../main/org/apache/sis/gui/RecentFiles.java       |  2 +-
 .../apache/sis/gui/controls/SyncWindowList.java    |  2 +-
 .../apache/sis/gui/controls/ValueColorMapper.java  |  2 +-
 .../org/apache/sis/gui/dataset/ExpandableList.java |  2 +-
 .../org/apache/sis/gui/dataset/FeatureList.java    |  2 +-
 .../org/apache/sis/gui/dataset/FeatureLoader.java  |  2 +-
 .../org/apache/sis/gui/dataset/FeatureTable.java   |  2 +-
 .../org/apache/sis/gui/dataset/ResourceCell.java   |  2 +-
 .../apache/sis/gui/internal/BackgroundThreads.java |  4 +-
 .../apache/sis/gui/internal/DataStoreOpener.java   |  2 +-
 .../apache/sis/gui/internal/ImageConverter.java    |  2 +-
 .../org/apache/sis/gui/internal/LogHandler.java    |  4 +-
 .../sis/gui/internal/PropertyValueFormats.java     |  2 +-
 .../sis/gui/internal/PropertyValueFormatter.java   |  2 +-
 .../org/apache/sis/gui/internal/RecentChoices.java |  2 +-
 .../apache/sis/gui/internal/io/FileAccessItem.java |  2 +-
 .../gui/internal/io/OptionalDataDownloader.java    |  2 +-
 .../main/org/apache/sis/gui/map/MapCanvas.java     |  8 +-
 .../main/org/apache/sis/gui/map/MapCanvasAWT.java  |  2 +-
 .../main/org/apache/sis/gui/map/StatusBar.java     |  2 +-
 .../org/apache/sis/gui/map/ValuesFormatter.java    |  2 +-
 .../sis/gui/metadata/IdentificationInfo.java       |  2 +-
 .../apache/sis/gui/metadata/MetadataSummary.java   |  2 +-
 .../sis/gui/metadata/RepresentationInfo.java       |  2 +-
 .../apache/sis/gui/referencing/AuthorityCodes.java |  4 +-
 .../org/apache/sis/gui/referencing/CodeFilter.java |  2 +-
 .../gui/referencing/RecentReferenceSystems.java    |  4 +-
 .../main/org/apache/sis/gui/referencing/Utils.java |  2 +-
 764 files changed, 1257 insertions(+), 1257 deletions(-)

diff --git a/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java b/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
index c72ca8b561..78e9ad15bc 100644
--- a/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
+++ b/endorsed/src/org.apache.sis.cloud.aws/main/org/apache/sis/cloud/aws/s3/ClientFileSystem.java
@@ -30,7 +30,7 @@ import java.nio.file.ClosedFileSystemException;
 import java.nio.file.attribute.BasicFileAttributeView;
 import java.nio.file.attribute.UserPrincipalLookupService;
 import java.nio.file.spi.FileSystemProvider;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.ArgumentChecks;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java
index dca273fca9..5391f3ccfb 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/AboutCommand.java
@@ -36,12 +36,12 @@ import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.collection.TableColumn;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.system.Supervisor;
-import org.apache.sis.internal.system.SupervisorMBean;
-import org.apache.sis.internal.system.DataDirectory;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.system.Supervisor;
+import org.apache.sis.system.SupervisorMBean;
+import org.apache.sis.system.DataDirectory;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.util.internal.X364;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
index 024662d3e2..d4423df9ad 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/CommandRunner.java
@@ -31,7 +31,7 @@ import java.nio.charset.Charset;
 import org.apache.sis.util.Locales;
 import org.apache.sis.util.Exceptions;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
index 3c306f280e..0861b97ab7 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/IdentifierCommand.java
@@ -28,7 +28,7 @@ import org.opengis.metadata.Identifier;
 import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.opengis.util.FactoryException;
 import org.opengis.referencing.ReferenceSystem;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java
index 13a186b5e7..0ccff00d7c 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/ResourcesDownloader.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import java.io.Console;
-import org.apache.sis.internal.util.X364;
-import org.apache.sis.internal.system.Fallback;
+import org.apache.sis.util.internal.X364;
+import org.apache.sis.system.Fallback;
 import org.apache.sis.setup.OptionalInstallations;
 
 
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
index eed139f1b3..037725c30b 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java
@@ -51,10 +51,10 @@ import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.storage.base.CodeType;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.CRS;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 import org.apache.sis.io.LineAppender;
 import org.apache.sis.io.TableAppender;
 import org.apache.sis.io.wkt.Colors;
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java
index 042447b74a..825c4615dd 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java
@@ -21,7 +21,7 @@
  *
  * <h2>SIS installation on remote machines</h2>
  * Some sub-commands can operate on SIS installation on remote machines, provided that Apache SIS
- * has been {@linkplain org.apache.sis.internal.system.Supervisor#ENABLED compiled with MBeans enabled}
+ * has been {@linkplain org.apache.sis.system.Supervisor#ENABLED compiled with MBeans enabled}
  * and that the remote Java Virtual Machine has been started with the following options:
  *
  * {@snippet lang="shell" :
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
index ffd3b490b9..4f495c3b5a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/CoverageCombiner.java
@@ -41,8 +41,8 @@ import org.apache.sis.measure.NumberRange;
 import org.apache.sis.coverage.internal.SampleDimensions;
 
 import static java.lang.Math.round;
-import static org.apache.sis.internal.util.Numerics.saturatingAdd;
-import static org.apache.sis.internal.util.Numerics.saturatingSubtract;
+import static org.apache.sis.util.internal.Numerics.saturatingAdd;
+import static org.apache.sis.util.internal.Numerics.saturatingSubtract;
 
 // Branch-dependent imports
 import org.opengis.coverage.CannotEvaluateException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java
index 6c1f301e44..442eebeb09 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleDimension.java
@@ -32,7 +32,7 @@ import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.referencing.operation.MathTransform1D;
 import org.apache.sis.referencing.operation.transform.TransferFunction;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.feature.internal.Resources;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.measure.NumberRange;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java
index 30b54efefa..66759e0287 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/SampleRangeFormat.java
@@ -25,8 +25,8 @@ import org.opengis.util.GenericName;
 import org.apache.sis.io.TableAppender;
 import org.apache.sis.measure.Range;
 import org.apache.sis.measure.RangeFormat;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java
index 70c97bc643..37a5ea26c5 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BandAggregateGridCoverage.java
@@ -25,7 +25,7 @@ import org.apache.sis.image.DataType;
 import org.apache.sis.image.ImageProcessor;
 import org.apache.sis.feature.internal.Resources;
 import org.apache.sis.coverage.internal.MultiSourceArgument;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
index 1f1bfffd19..d39b234d76 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/CoordinateOperationFinder.java
@@ -43,7 +43,7 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java
index 52285d6681..900c191429 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DefaultEvaluator.java
@@ -33,7 +33,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.util.WraparoundAxesFinder;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java
index 569e5d2a8e..0c4757647a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java
@@ -33,8 +33,8 @@ import org.apache.sis.util.Utilities;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.ArgumentCheckByAssertion;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.ArgumentCheckByAssertion;
 import org.apache.sis.feature.internal.Resources;
 import org.apache.sis.geometry.ImmutableEnvelope;
 import org.apache.sis.coverage.SubspaceNotSpecifiedException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
index 872ed37c0e..bf2a430213 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java
@@ -27,7 +27,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.datum.PixelInCell;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.StringBuilders;
 import org.apache.sis.util.resources.Errors;
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java
index e5e277e623..3f6f58ff37 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java
@@ -28,7 +28,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.operation.MathTransform1D;
 import org.opengis.referencing.operation.TransformException;
 import org.opengis.referencing.operation.NoninvertibleTransformException;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.coverage.BandedCoverage;
 import org.apache.sis.coverage.SampleDimension;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java
index 37920a87f9..7f4451c1ea 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverageProcessor.java
@@ -46,7 +46,7 @@ import org.apache.sis.coverage.internal.MultiSourceArgument;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.measure.NumberRange;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java
index 15889448d3..bf65f451d9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java
@@ -47,9 +47,9 @@ import org.apache.sis.util.collection.WeakValueHashMap;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.geometry.AbstractEnvelope;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.geometry.Envelopes;
@@ -65,7 +65,7 @@ import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 
 // Branch-dependent imports
 import org.opengis.coverage.grid.GridEnvelope;
@@ -1036,7 +1036,7 @@ public class GridExtent implements GridEnvelope, LenientComparable, Serializable
      * A (dimension, size) tuple. Used for sorting dimensions by their size.
      * This is used for {@link GridExtent#getLargestDimensions()} implementation.
      */
-    private static final class DimSize extends org.apache.sis.internal.jdk17.Record implements Comparable<DimSize> {
+    private static final class DimSize extends org.apache.sis.pending.jdk.Record implements Comparable<DimSize> {
         /** Index of the dimension.      */ private final int  dim;
         /** Size as an unsigned integer. */ private final long size;
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
index 33dfe45498..bee3cae881 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java
@@ -61,8 +61,8 @@ import org.apache.sis.referencing.util.TemporalAccessor;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.metadata.internal.ReferencingServices;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.collection.TableColumn;
 import org.apache.sis.util.collection.DefaultTreeTable;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java
index 77c6a3d3ba..b863a8a5ce 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ReducedGridCoverage.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.awt.image.RenderedImage;
 import org.opengis.geometry.DirectPosition;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java
index 08923f5feb..54e278d856 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ResampledGridCoverage.java
@@ -31,7 +31,7 @@ import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.image.ImageProcessor;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.operation.transform.LinearTransform;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java
index b4ec377264..e09dc95b29 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/SliceGeometry.java
@@ -34,7 +34,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.geometry.ImmutableEnvelope;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.util.MathTransformsOrFactory;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelBuilder.java
index 417f7245c1..c8d3df5c5c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelBuilder.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.coverage.Category;
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelFactory.java
index 2f5566977a..d89c8bb13e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelFactory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ColorModelFactory.java
@@ -33,8 +33,8 @@ import java.awt.image.DataBuffer;
 import java.awt.image.RenderedImage;
 import org.apache.sis.image.DataType;
 import org.apache.sis.measure.NumberRange;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageLayout.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageLayout.java
index d646073192..2efa871736 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageLayout.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageLayout.java
@@ -31,8 +31,8 @@ import org.apache.sis.image.ComputedImage;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.system.Configuration;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageUtilities.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageUtilities.java
index f88e7a2fbc..fa716b83dc 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageUtilities.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ImageUtilities.java
@@ -31,9 +31,9 @@ import java.awt.image.SampleModel;
 import java.awt.image.SinglePixelPackedSampleModel;
 import java.awt.image.MultiPixelPackedSampleModel;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.resources.Vocabulary;
@@ -43,7 +43,7 @@ import static java.lang.Math.rint;
 import static java.lang.Math.floorDiv;
 import static java.lang.Math.toIntExact;
 import static java.lang.Math.multiplyFull;
-import static org.apache.sis.internal.util.Numerics.COMPARISON_THRESHOLD;
+import static org.apache.sis.util.internal.Numerics.COMPARISON_THRESHOLD;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/SampleModelFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/SampleModelFactory.java
index 734d3ec6c6..ffff04db75 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/SampleModelFactory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/SampleModelFactory.java
@@ -25,7 +25,7 @@ import java.awt.image.PixelInterleavedSampleModel;
 import java.awt.image.MultiPixelPackedSampleModel;
 import java.awt.image.SinglePixelPackedSampleModel;
 import java.awt.image.RasterFormatException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.image.DataType;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ScaledColorSpace.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ScaledColorSpace.java
index 9d338f8cea..cd75d1222b 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ScaledColorSpace.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/ScaledColorSpace.java
@@ -17,7 +17,7 @@
 package org.apache.sis.coverage.grid.j2d;
 
 import java.awt.color.ColorSpace;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.Debug;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileErrorHandler.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileErrorHandler.java
index 1e6ac6d1b0..b5d57c1d0e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileErrorHandler.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileErrorHandler.java
@@ -20,7 +20,7 @@ import java.util.logging.LogRecord;
 import java.awt.image.RenderedImage;
 import java.awt.image.ImagingOpException;
 import org.apache.sis.image.ErrorHandler;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileOpExecutor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileOpExecutor.java
index daa2f7a790..1067d027d1 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileOpExecutor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TileOpExecutor.java
@@ -37,8 +37,8 @@ import org.apache.sis.util.Exceptions;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.image.ErrorHandler;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.system.CommonExecutor;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.CommonExecutor;
+import org.apache.sis.util.internal.Strings;
 
 import static java.lang.Math.addExact;
 import static java.lang.Math.subtractExact;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TilePlaceholder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TilePlaceholder.java
index ff7cb79310..463deaa128 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TilePlaceholder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/j2d/TilePlaceholder.java
@@ -31,8 +31,8 @@ import org.apache.sis.util.Disposable;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.system.ReferenceQueueConsumer;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.system.ReferenceQueueConsumer;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/CommonDomainFinder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/CommonDomainFinder.java
index 52756ed530..f371de470f 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/CommonDomainFinder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/CommonDomainFinder.java
@@ -34,7 +34,7 @@ import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.IllegalGridGeometryException;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.Numbers;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/MultiSourceArgument.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/MultiSourceArgument.java
index e16340f9f6..a78cc18f8c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/MultiSourceArgument.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/MultiSourceArgument.java
@@ -30,7 +30,7 @@ import org.opengis.referencing.datum.PixelInCell;
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.IllegalGridGeometryException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/RangeArgument.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/RangeArgument.java
index f85c35c159..227e2526d9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/RangeArgument.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/internal/RangeArgument.java
@@ -27,7 +27,7 @@ import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
 import org.apache.sis.coverage.grid.j2d.SampleModelFactory;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.MathFunctions;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
index 65e20c2164..a8986b6e81 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractFeature.java
@@ -30,7 +30,7 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.CorruptedObjectException;
-import org.apache.sis.internal.util.CheckedArrayList;
+import org.apache.sis.util.internal.CheckedArrayList;
 import org.apache.sis.feature.internal.Resources;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
index abc697ffd0..9fddbb1e15 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/AbstractIdentifiedType.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
 import org.opengis.util.NameFactory;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.util.iso.DefaultNameFactory;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Deprecable;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
index 154eaec389..ebe56eab6d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicMap.java
@@ -19,10 +19,10 @@ package org.apache.sis.feature;
 import java.util.Map;
 import org.opengis.util.GenericName;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.Cloner;
-import org.apache.sis.internal.util.CloneAccess;
-import org.apache.sis.internal.util.AbstractMap;
-import org.apache.sis.internal.util.AbstractMapEntry;
+import org.apache.sis.util.internal.Cloner;
+import org.apache.sis.util.internal.CloneAccess;
+import org.apache.sis.util.internal.AbstractMap;
+import org.apache.sis.util.internal.AbstractMapEntry;
 import org.apache.sis.feature.internal.Resources;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
index 8c0fc0e03f..601035965c 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/CharacteristicTypeMap.java
@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.HashMap;
 import org.opengis.util.ScopedName;
 import org.opengis.util.GenericName;
-import org.apache.sis.internal.util.AbstractMap;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.AbstractMap;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.collection.WeakValueHashMap;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
index 8dda841953..4d2a841321 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DefaultFeatureType.java
@@ -36,8 +36,8 @@ import org.opengis.util.InternationalString;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.collection.Containers;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.feature.internal.Resources;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
index 83815273c2..24a6de1f01 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/DenseFeature.java
@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.Arrays;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.opengis.metadata.quality.DataQuality;
-import org.apache.sis.internal.util.CloneAccess;
-import org.apache.sis.internal.util.Cloner;
+import org.apache.sis.util.internal.CloneAccess;
+import org.apache.sis.util.internal.Cloner;
 import org.apache.sis.util.ArgumentChecks;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java
index 5ae6f308df..99c5dba93e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/EnvelopeOperation.java
@@ -33,7 +33,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.feature.internal.AttributeConvention;
 import org.apache.sis.feature.internal.FeatureUtilities;
 import org.apache.sis.geometry.wrapper.Geometries;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java
index 26931a1776..43984a0421 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/FeatureFormat.java
@@ -43,8 +43,8 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
 import org.apache.sis.referencing.IdentifiedObjects;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
index 1b96afd0b2..103e7a14b5 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAssociation.java
@@ -17,7 +17,7 @@
 package org.apache.sis.feature;
 
 import java.util.Collection;
-import org.apache.sis.internal.util.CheckedArrayList;
+import org.apache.sis.util.internal.CheckedArrayList;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.feature.internal.Resources;
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java
index a12af2a865..6470f06bf2 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/MultiValuedAttribute.java
@@ -17,8 +17,8 @@
 package org.apache.sis.feature;
 
 import java.util.Collection;
-import org.apache.sis.internal.util.CloneAccess;
-import org.apache.sis.internal.util.CheckedArrayList;
+import org.apache.sis.util.internal.CloneAccess;
+import org.apache.sis.util.internal.CheckedArrayList;
 import org.apache.sis.util.collection.CheckedContainer;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
index f6b17d590a..b5a24e78e4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/NamedFeatureType.java
@@ -27,7 +27,7 @@ import org.opengis.feature.PropertyNotFoundException;
 import org.opengis.feature.FeatureInstantiationException;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.feature.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
index 0750738d1c..4b69da6b68 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SingletonAttribute.java
@@ -17,7 +17,7 @@
 package org.apache.sis.feature;
 
 import java.util.Objects;
-import org.apache.sis.internal.util.CloneAccess;
+import org.apache.sis.util.internal.CloneAccess;
 
 // Branch-dependent imports
 import org.opengis.feature.AttributeType;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
index 781bd7475a..de49c31468 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/SparseFeature.java
@@ -22,8 +22,8 @@ import java.util.Objects;
 import java.util.ConcurrentModificationException;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.opengis.metadata.quality.DataQuality;
-import org.apache.sis.internal.util.CloneAccess;
-import org.apache.sis.internal.util.Cloner;
+import org.apache.sis.util.internal.CloneAccess;
+import org.apache.sis.util.internal.Cloner;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.CorruptedObjectException;
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
index 3cd3428d8b..4bb36268af 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
@@ -25,8 +25,8 @@ import java.io.Serializable;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.util.GenericName;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.converter.SurjectiveConverter;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.converter.SurjectiveConverter;
 import org.apache.sis.feature.internal.AttributeConvention;
 import org.apache.sis.feature.internal.FeatureUtilities;
 import org.apache.sis.feature.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
index 5fbab063f2..be5fe0f4de 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/builder/AttributeTypeBuilder.java
@@ -29,9 +29,9 @@ import org.opengis.util.GenericName;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.apache.sis.feature.DefaultAttributeType;
 import org.apache.sis.feature.FeatureOperations;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.SetOfUnknownSize;
-import org.apache.sis.internal.util.AbstractIterator;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.SetOfUnknownSize;
+import org.apache.sis.util.internal.AbstractIterator;
 import org.apache.sis.feature.internal.AttributeConvention;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.feature.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/MovingFeatures.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/MovingFeatures.java
index fb84be3204..d667c1bbd2 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/MovingFeatures.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/MovingFeatures.java
@@ -23,7 +23,7 @@ import org.apache.sis.util.iso.Names;
 import org.apache.sis.math.Vector;
 import org.apache.sis.feature.DefaultAttributeType;
 import org.apache.sis.referencing.crs.DefaultTemporalCRS;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 // Branch-dependent imports
 import org.opengis.feature.Attribute;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
index 0575673a22..f5f70ce3aa 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
@@ -35,7 +35,7 @@ import org.apache.sis.geometry.WraparoundMethod;
 import org.apache.sis.util.iso.AbstractFactory;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.AbstractMap;
+import org.apache.sis.util.internal.AbstractMap;
 
 // Branch-dependent imports
 import org.opengis.filter.*;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
index bb8e4a4716..1f74a2dd18 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/LogicalFilter.java
@@ -21,8 +21,8 @@ import java.util.Collection;
 import java.util.LinkedHashSet;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.filter.internal.Node;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 // Branch-dependent imports
 import org.opengis.filter.Filter;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
index 36f4be387d..39ea280dda 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/Optimization.java
@@ -27,7 +27,7 @@ import org.opengis.util.CodeList;
 import org.apache.sis.math.FunctionProperty;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.filter.internal.Node;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 // Branch-dependent imports
 import org.opengis.filter.Filter;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java
index c9d62d87ec..2255bceba4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/CopyVisitor.java
@@ -26,7 +26,7 @@ import org.opengis.geometry.Envelope;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 // Branch-dependent imports
 import org.opengis.filter.*;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
index 595cf45bd4..35b8335292 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/Node.java
@@ -39,7 +39,7 @@ import org.apache.sis.util.collection.TableColumn;
 import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 
 // Branch-dependent imports
 import org.opengis.filter.Filter;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/SortByComparator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/SortByComparator.java
index e6380f47d9..ecad14c43a 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/SortByComparator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/SortByComparator.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
 import java.util.Comparator;
 import java.io.Serializable;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 // Branch-dependent imports
 import org.opengis.filter.SortBy;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
index 0adb199159..1f063b482e 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/FunctionWithSRID.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.CRS;
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
 import org.apache.sis.feature.builder.PropertyTypeBuilder;
 import org.apache.sis.feature.builder.AttributeTypeBuilder;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.resources.Errors;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/Registry.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/Registry.java
index 0015e92cd7..d07c745462 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/Registry.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/Registry.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.filter.internal.FunctionRegister;
-import org.apache.sis.internal.jdk17.JDK17;
+import org.apache.sis.pending.jdk.JDK17;
 
 // Branch-dependent imports
 import org.opengis.filter.Expression;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
index 943870d8f8..1f5c6adb89 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/sqlmm/ST_Point.java
@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.resources.Errors;
 
 import static java.lang.Double.isNaN;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
index 35910bdc65..0335f9a5b9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
@@ -33,7 +33,7 @@ import org.apache.sis.feature.internal.Resources;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.cs.AxesConvention;
 import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.math.Vector;
 import org.apache.sis.setup.GeometryLibrary;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java
index 57bbeadc1a..321b7a5b3b 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryType.java
@@ -22,7 +22,7 @@ import org.opengis.util.TypeName;
 import org.opengis.util.NameSpace;
 import org.apache.sis.util.iso.Names;
 import org.apache.sis.setup.GeometryLibrary;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.iso.DefaultNameFactory;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
index fc6604fb59..33e960b7f4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/SpatialOperationContext.java
@@ -44,7 +44,7 @@ import org.apache.sis.referencing.CRS;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java
index e7a7722bfe..fe11b59442 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/esri/Factory.java
@@ -37,7 +37,7 @@ import org.apache.sis.setup.GeometryLibrary;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.geometry.wrapper.GeometryType;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.math.Vector;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java
index da357de56a..97821413aa 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Factory.java
@@ -31,7 +31,7 @@ import org.apache.sis.geometry.wrapper.GeometryType;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
 import org.apache.sis.referencing.util.j2d.AbstractShape;
 import org.apache.sis.referencing.util.j2d.ShapeUtilities;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.math.Vector;
 import org.apache.sis.util.UnsupportedImplementationException;
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Polyline.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Polyline.java
index 2f032de9c2..50360ffe95 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Polyline.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/j2d/Polyline.java
@@ -23,7 +23,7 @@ import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.PathIterator;
 import java.awt.geom.AffineTransform;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.Classes;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java
index c5bb1d9d28..62d0959564 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/Factory.java
@@ -28,7 +28,7 @@ import org.apache.sis.setup.GeometryLibrary;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.geometry.wrapper.GeometryType;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.math.Vector;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/FilteringContext.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/FilteringContext.java
index 36bbd21614..7d3f9c8f67 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/FilteringContext.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/FilteringContext.java
@@ -20,8 +20,8 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.sis.internal.system.DelayedExecutor;
-import org.apache.sis.internal.system.DelayedRunnable;
+import org.apache.sis.system.DelayedExecutor;
+import org.apache.sis.system.DelayedRunnable;
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.io.WKBWriter;
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
index 2bbbcfac44..1683efdce3 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
@@ -31,7 +31,7 @@ import org.apache.sis.util.logging.Logging;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.util.ArgumentChecks;
 import org.locationtech.jts.geom.Envelope;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java
index da3f41db17..42fd7179e3 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/AnnotatedImage.java
@@ -34,7 +34,7 @@ import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.coverage.grid.j2d.TileOpExecutor;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
index ec4da1ec57..ed1167b839 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/BandedSampleConverter.java
@@ -36,7 +36,7 @@ import org.apache.sis.coverage.grid.j2d.ImageLayout;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.coverage.grid.j2d.TileOpExecutor;
 import org.apache.sis.coverage.internal.SampleDimensions;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.Disposable;
 import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
index 0d6716419c..009ababda9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedImage.java
@@ -33,7 +33,7 @@ import java.awt.image.ColorModel;
 import java.awt.image.SampleModel;
 import java.awt.image.TileObserver;
 import java.awt.image.ImagingOpException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedTiles.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedTiles.java
index 12ecf6ac15..7831589720 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedTiles.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ComputedTiles.java
@@ -25,7 +25,7 @@ import java.awt.image.TileObserver;
 import java.awt.image.ImagingOpException;
 import java.awt.image.WritableRenderedImage;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.system.ReferenceQueueConsumer;
+import org.apache.sis.system.ReferenceQueueConsumer;
 import org.apache.sis.util.Disposable;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java
index e2df2b293b..c5da8d7351 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/DataType.java
@@ -26,7 +26,7 @@ import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.feature.internal.Resources;
 import org.apache.sis.util.resources.Errors;
 
-import static org.apache.sis.internal.util.Numerics.MAX_INTEGER_CONVERTIBLE_TO_FLOAT;
+import static org.apache.sis.util.internal.Numerics.MAX_INTEGER_CONVERTIBLE_TO_FLOAT;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorAction.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorAction.java
index 9a88852481..151ea75e70 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorAction.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ErrorAction.java
@@ -20,7 +20,7 @@ import java.util.logging.Logger;
 import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;
 import java.awt.image.ImagingOpException;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java
index 42cb7180d7..2dca769059 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ImageProcessor.java
@@ -49,7 +49,7 @@ import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.coverage.grid.j2d.TiledImage;
 import org.apache.sis.image.processing.isoline.Isolines;
 import org.apache.sis.feature.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java
index f42e6ec6f6..22b23759f9 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MaskedImage.java
@@ -32,13 +32,13 @@ import java.awt.image.IndexColorModel;
 import java.awt.image.MultiPixelPackedSampleModel;
 import java.lang.ref.SoftReference;
 import java.nio.ByteOrder;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.coverage.grid.j2d.FillValues;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.coverage.grid.j2d.TilePlaceholder;
 
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
-import static org.apache.sis.internal.util.Numerics.LONG_SHIFT;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.LONG_SHIFT;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java
index be3f5a134a..ac8d4ca6df 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/MultiSourcePrefetch.java
@@ -22,7 +22,7 @@ import java.awt.Rectangle;
 import java.awt.image.RenderedImage;
 import java.awt.image.ImagingOpException;
 import org.apache.sis.util.Disposable;
-import org.apache.sis.internal.system.CommonExecutor;
+import org.apache.sis.system.CommonExecutor;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
index 779d7b7b4b..988ac22d45 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PixelIterator.java
@@ -43,12 +43,12 @@ import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.measure.NumberRange;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.feature.internal.Resources;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 
 import static java.lang.Math.floorDiv;
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
index ea6afd72ff..7303ec8157 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/PlanarImage.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.Disposable;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Messages;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.coverage.grid.j2d.TileOpExecutor;
 import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java
index 707fc4d0ad..3c45493aaf 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/RecoloredImage.java
@@ -29,7 +29,7 @@ import org.apache.sis.coverage.Category;
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java
index 2a4105e475..26c4fdb7d7 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResampledImage.java
@@ -39,7 +39,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.coverage.grid.j2d.FillValues;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.Disposable;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java
index 5730fcdef7..0325e482d6 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/ResamplingGrid.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix2;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.referencing.operation.transform.AbstractMathTransform2D;
 import org.apache.sis.referencing.util.j2d.AffineTransform2D;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.io.wkt.Formatter;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java
index 639b2d996d..e59292a990 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/TileCache.java
@@ -21,7 +21,7 @@ import java.awt.image.DataBuffer;
 import java.awt.image.Raster;
 import java.lang.ref.Reference;
 import org.apache.sis.util.collection.Cache;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.feature.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java
index e85ea4e131..1cb3f4ac3b 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/Transferer.java
@@ -30,9 +30,9 @@ import org.opengis.referencing.operation.MathTransform1D;
 import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.coverage.grid.j2d.ImageLayout;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java
index 4daf434d7e..e8740b999d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/CompoundFuture.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.CancellationException;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.feature.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java
index 2e2248968e..91d36ccd85 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/TiledProcess.java
@@ -22,8 +22,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.Callable;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.sis.internal.system.CommonExecutor;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.system.CommonExecutor;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.image.PixelIterator;
 import org.apache.sis.util.ArgumentChecks;
 
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java
index 5862b2d7cc..78d30cfc4d 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/image/processing/isoline/Fragments.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.Collections;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java
index f34c03d513..66edafb7f8 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/NodeIterator.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.util.Spliterator;
 import java.util.function.Consumer;
 import org.opengis.geometry.Envelope;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java
index 46931417b4..c1acf8a239 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/index/tree/PointTree.java
@@ -26,7 +26,7 @@ import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import org.opengis.geometry.Envelope;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.CheckedContainer;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
index 9442876254..87f5f769b8 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridExtentTest.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.matrix.Matrix3;
 import org.apache.sis.referencing.crs.HardCodedCRS;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ImageUtilitiesTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ImageUtilitiesTest.java
index 52accb49a3..94c6f3404f 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ImageUtilitiesTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/j2d/ImageUtilitiesTest.java
@@ -31,7 +31,7 @@ import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static org.apache.sis.internal.util.Numerics.COMPARISON_THRESHOLD;
+import static org.apache.sis.util.internal.Numerics.COMPARISON_THRESHOLD;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java
index 3112dd90a1..f0110c50ac 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/FeatureMemoryBenchmark.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import org.opengis.feature.Feature;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.StandardDateFormat;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
index 931d01fbd2..feb91a38c8 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/TemporalFilterTest.java
@@ -24,7 +24,7 @@ import org.apache.sis.test.TestUtilities;
 import static org.junit.Assert.*;
 import static org.opengis.test.Assert.assertInstanceOf;
 import static org.apache.sis.test.Assertions.assertSerializedEquals;
-import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
 
 // Branch-dependent imports
 import org.opengis.feature.Feature;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java
index 3172569fd7..59d1b5d8f3 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/InterpolationTest.java
@@ -23,7 +23,7 @@ import java.awt.image.DataBuffer;
 import java.awt.image.WritableRaster;
 import java.awt.image.BandedSampleModel;
 import org.apache.sis.coverage.grid.j2d.TiledImage;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
index eecbcff892..565338b07c 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ResamplingGridTest.java
@@ -28,7 +28,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.operation.HardCodedConversions;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.referencing.util.j2d.AffineTransform2D;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.Statistics;
 import org.apache.sis.math.StatisticsFormat;
 import org.apache.sis.test.TestUtilities;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java
index afa9babe3f..8fc8af9bec 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/StatisticsCalculatorTest.java
@@ -23,7 +23,7 @@ import java.awt.image.DataBuffer;
 import java.awt.image.RenderedImage;
 import java.awt.image.ImagingOpException;
 import java.util.function.DoubleUnaryOperator;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.math.Statistics;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.LoggingWatcher;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java
index 69bb66dcb5..908f00ad7b 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/TiledImageMock.java
@@ -38,7 +38,7 @@ import java.awt.image.WritableRaster;
 import java.awt.image.WritableRenderedImage;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.coverage.grid.j2d.WritableTiledImage;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ArraysExt;
 
 import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/FeatureComparator.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/FeatureComparator.java
index e5c5151828..edafde0c19 100644
--- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/FeatureComparator.java
+++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/test/feature/FeatureComparator.java
@@ -27,7 +27,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.stream.Collectors;
 import org.opengis.util.GenericName;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Deprecable;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.internal.util.MetadataServices b/endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.util.internal.MetadataServices
similarity index 100%
rename from endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.internal.util.MetadataServices
rename to endorsed/src/org.apache.sis.metadata/main/META-INF/services/org.apache.sis.util.internal.MetadataServices
diff --git a/endorsed/src/org.apache.sis.metadata/main/module-info.java b/endorsed/src/org.apache.sis.metadata/main/module-info.java
index 7424dd29e1..e120513b92 100644
--- a/endorsed/src/org.apache.sis.metadata/main/module-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/module-info.java
@@ -44,7 +44,7 @@ module org.apache.sis.metadata {
     provides org.apache.sis.xml.bind.TypeRegistration
         with org.apache.sis.metadata.internal.MetadataTypes;
 
-    provides org.apache.sis.internal.util.MetadataServices
+    provides org.apache.sis.util.internal.MetadataServices
         with org.apache.sis.metadata.internal.ServicesForUtility;
 
     uses org.apache.sis.metadata.internal.ReferencingServices;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataFormat.java
index 34cd53944d..38e6d336f1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataFormat.java
@@ -20,7 +20,7 @@ import java.util.Locale;
 import java.util.TimeZone;
 import org.apache.sis.util.collection.TableColumn;
 import org.apache.sis.util.collection.TreeTableFormat;
-import org.apache.sis.internal.system.LocalizedStaticObject;
+import org.apache.sis.system.LocalizedStaticObject;
 import org.apache.sis.io.TableAppender;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
index e0e6f3956c..c978d9037f 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
@@ -33,12 +33,12 @@ import org.apache.sis.util.Classes;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.collection.CheckedContainer;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.system.SystemListener;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.system.SystemListener;
 import org.apache.sis.metadata.simple.SimpleCitation;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
 import static org.apache.sis.util.ArgumentChecks.ensureNonNullElement;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
index 52ee3984b7..7845cbad67 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitor.java
@@ -21,8 +21,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.IdentityHashMap;
 import java.util.ConcurrentModificationException;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.Exceptions;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java
index 4dd49e0d5f..877fdc956b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataVisitorException.java
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.metadata;
 
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.LocalizedException;
 import org.apache.sis.util.collection.BackingStoreException;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
index 1bb47fdb5b..4c19747799 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ModifiableMetadata.java
@@ -35,11 +35,11 @@ import org.opengis.metadata.Metadata;               // For javadoc
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.collection.CodeListSet;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.CheckedHashSet;
-import org.apache.sis.internal.util.CheckedArrayList;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.CheckedHashSet;
+import org.apache.sis.util.internal.CheckedArrayList;
 import org.apache.sis.metadata.internal.Resources;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.system.Semaphores;
 
 import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
 import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java
index 085dbe2126..9f8fc8c275 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/PropertyAccessor.java
@@ -28,8 +28,8 @@ import java.lang.reflect.InvocationTargetException;
 import org.opengis.annotation.UML;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.ExtendedElementInformation;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.measure.ValueRange;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.Numbers;
@@ -48,8 +48,8 @@ import org.apache.sis.xml.IdentifiedObject;
 
 import static org.apache.sis.metadata.PropertyComparator.*;
 import static org.apache.sis.metadata.ValueExistencePolicy.isNullOrEmpty;
-import static org.apache.sis.internal.util.CollectionsExt.snapshot;
-import static org.apache.sis.internal.util.CollectionsExt.modifiableCopy;
+import static org.apache.sis.util.internal.CollectionsExt.snapshot;
+import static org.apache.sis.util.internal.CollectionsExt.modifiableCopy;
 import static org.apache.sis.util.collection.Containers.hashMapCapacity;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
index c9503b204a..06df0a99df 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/Pruner.java
@@ -20,7 +20,7 @@ import java.util.Iterator;
 import java.util.Collection;
 import org.opengis.util.ControlledVocabulary;
 import org.apache.sis.util.Emptiable;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 import static org.apache.sis.metadata.ValueExistencePolicy.*;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StandardImplementation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StandardImplementation.java
index 14196dcfee..e42e26bbfc 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StandardImplementation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StandardImplementation.java
@@ -26,7 +26,7 @@ import org.opengis.annotation.Classifier;
 import org.opengis.annotation.Stereotype;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java
index 7c4082cd0e..b1afc292ad 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/StateChanger.java
@@ -22,10 +22,10 @@ import java.util.EnumSet;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
-import org.apache.sis.internal.util.Cloner;
+import org.apache.sis.util.internal.Cloner;
 import org.apache.sis.util.collection.CodeListSet;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.metadata.iso.identification.DefaultRepresentativeFraction;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java
index 5dbae09e62..1ed8c43dbe 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeNode.java
@@ -26,7 +26,7 @@ import java.util.NoSuchElementException;
 import java.util.ConcurrentModificationException;
 import java.util.function.Function;
 import org.apache.sis.xml.bind.lan.LocaleAndCharset;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java
index 39c037eba6..7a3c012de8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/TreeTableView.java
@@ -26,11 +26,11 @@ import org.opengis.metadata.citation.Citation;
 import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.collection.TableColumn;
 import org.apache.sis.util.collection.TreeTableFormat;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.xml.bind.SpecializedIdentifier;
 import org.apache.sis.xml.bind.NonMarshalledAuthority;
-import org.apache.sis.internal.util.TreeFormatCustomization;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.util.internal.TreeFormatCustomization;
+import org.apache.sis.system.Semaphores;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueMap.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueMap.java
index 7d79b47162..f63690a376 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueMap.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/ValueMap.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import org.apache.sis.internal.util.AbstractMapEntry;
+import org.apache.sis.util.internal.AbstractMapEntry;
 
 import static org.apache.sis.metadata.PropertyAccessor.RETURN_NULL;
 import static org.apache.sis.metadata.PropertyAccessor.RETURN_PREVIOUS;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java
index 0ee5eb7bb7..d1ce6934e7 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/AxisNames.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import java.util.HashMap;
 import java.lang.reflect.Field;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 
 import static java.util.logging.Logger.getLogger;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Identifiers.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Identifiers.java
index dc28ec2fac..c80d27d158 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Identifiers.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/Identifiers.java
@@ -20,9 +20,9 @@ import java.util.Locale;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Characters;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ImplementationHelper.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ImplementationHelper.java
index 95f3714f89..de6bedbea3 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ImplementationHelper.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ImplementationHelper.java
@@ -27,8 +27,8 @@ import org.apache.sis.xml.IdentifiedObject;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
@@ -218,7 +218,7 @@ public final class ImplementationHelper extends Static {
      * @param  newValue  the new value to set, or {@code null} for instead removing the first element.
      * @return the collection (may or may not be the given {@code values} collection).
      *
-     * @see org.apache.sis.internal.util.CollectionsExt#first(Iterable)
+     * @see org.apache.sis.util.internal.CollectionsExt#first(Iterable)
      */
     public static <T> Collection<T> setFirst(Collection<T> values, final T newValue) {
         if (values == null) {
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java
index 9551d7cc6b..fe718f137d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/NameMeaning.java
@@ -28,9 +28,9 @@ import org.opengis.referencing.operation.*;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.citation.Citation;
 import org.apache.sis.util.Static;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.DefinitionURI;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.DefinitionURI;
 import org.apache.sis.metadata.iso.citation.Citations;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/RecordSchemaSIS.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/RecordSchemaSIS.java
index ba0bbedffa..4ae1d689b2 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/RecordSchemaSIS.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/RecordSchemaSIS.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import java.io.ObjectStreamException;
 import org.opengis.util.TypeName;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.iso.DefaultRecordType;
 import org.apache.sis.util.iso.DefaultRecordSchema;
 import org.apache.sis.util.resources.Vocabulary;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java
index d5cb21b4ca..afe883a824 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ReferencingServices.java
@@ -32,8 +32,8 @@ import org.apache.sis.metadata.iso.extent.DefaultVerticalExtent;
 import org.apache.sis.metadata.iso.extent.DefaultTemporalExtent;
 import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent;
-import org.apache.sis.internal.system.OptionalDependency;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.OptionalDependency;
+import org.apache.sis.system.Modules;
 
 
 /**
@@ -68,7 +68,7 @@ public class ReferencingServices extends OptionalDependency {
 
     /**
      * For subclass only. This constructor registers this instance as a
-     * {@link org.apache.sis.internal.system.SystemListener} in order to
+     * {@link org.apache.sis.system.SystemListener} in order to
      * force a new {@code ReferencingServices} lookup if the module path changes.
      */
     protected ReferencingServices() {
@@ -296,7 +296,7 @@ public class ReferencingServices extends OptionalDependency {
      * @param  locale  language to use if possible.
      * @return the information, or {@code null} if none.
      *
-     * @see org.apache.sis.internal.util.MetadataServices#getInformation(String, Locale)
+     * @see org.apache.sis.util.internal.MetadataServices#getInformation(String, Locale)
      *
      * @since 0.7
      */
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
index 0108637755..d250535b48 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/ServicesForUtility.java
@@ -24,9 +24,9 @@ import javax.sql.DataSource;
 import java.sql.SQLException;
 import org.opengis.util.ControlledVocabulary;
 import org.opengis.metadata.citation.Citation;
-import org.apache.sis.internal.util.MetadataServices;
+import org.apache.sis.util.internal.MetadataServices;
 import org.apache.sis.metadata.sql.util.Initializer;
-import org.apache.sis.internal.system.SystemListener;
+import org.apache.sis.system.SystemListener;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.iso.Types;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/TemporalUtilities.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/TemporalUtilities.java
index 78665395f9..08aabece39 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/TemporalUtilities.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/internal/TemporalUtilities.java
@@ -22,10 +22,10 @@ import org.opengis.temporal.Instant;
 import org.opengis.temporal.Period;
 import org.opengis.temporal.TemporalFactory;
 import org.opengis.temporal.TemporalPrimitive;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.Reflect;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.temporal.DefaultTemporalFactory;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.Reflect;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.pending.temporal.DefaultTemporalFactory;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
index c6ec8ca2af..d72e163da5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
@@ -37,7 +37,7 @@ import org.apache.sis.xml.bind.FilterByVersion;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
index a5f50e7f03..ac8fe647aa 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/DefaultMetadata.java
@@ -70,7 +70,7 @@ import org.apache.sis.metadata.iso.identification.DefaultDataIdentification;
 import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
 import org.apache.sis.metadata.internal.ImplementationHelper;
 import org.apache.sis.metadata.internal.Dependencies;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.bind.lan.LocaleAndCharset;
 import org.apache.sis.xml.bind.lan.LocaleAdapter;
 import org.apache.sis.xml.bind.lan.OtherLocales;
@@ -82,7 +82,7 @@ import org.apache.sis.xml.bind.metadata.MD_Identifier;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.ObjectConverter;
-import org.apache.sis.internal.converter.SurjectiveConverter;
+import org.apache.sis.converter.SurjectiveConverter;
 import org.apache.sis.math.FunctionProperty;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java
index 4c1a390a93..b92afbecec 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/ISOMetadata.java
@@ -37,8 +37,8 @@ import org.apache.sis.xml.bind.IdentifierMapAdapter;
 import org.apache.sis.xml.bind.ModifiableIdentifierMap;
 import org.apache.sis.xml.bind.NonMarshalledAuthority;
 import org.apache.sis.metadata.internal.ImplementationHelper;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.system.Modules;
 import org.apache.sis.util.collection.Containers;
 
 import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
index 737af59c94..2280c074a2 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/Citations.java
@@ -29,14 +29,14 @@ import org.apache.sis.util.Static;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.metadata.internal.Identifiers;
 import org.apache.sis.metadata.simple.SimpleCitation;
 import org.apache.sis.metadata.simple.CitationConstant;
 import org.apache.sis.xml.bind.NonMarshalledAuthority;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.SystemListener;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.SystemListener;
 import org.apache.sis.metadata.iso.DefaultIdentifier;           // For javadoc
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
index e13a559ae7..5a074186df 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultContact.java
@@ -37,7 +37,7 @@ import org.apache.sis.xml.bind.gco.InternationalStringAdapter;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
 import org.apache.sis.xml.util.LegacyNamespaces;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
index e242d6034d..2be0fdbd6e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
@@ -26,7 +26,7 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.opengis.metadata.citation.Telephone;
 import org.opengis.metadata.citation.TelephoneType;
 import org.apache.sis.metadata.iso.ISOMetadata;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.bind.FilterByVersion;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.bind.gco.StringAdapter;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
index d086c5c647..a35f939b2d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
@@ -31,7 +31,7 @@ import org.opengis.metadata.content.ImageDescription;
 import org.opengis.metadata.content.RangeDimension;
 import org.opengis.metadata.content.RangeElementDescription;
 import org.opengis.util.RecordType;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
index 4a8c52bf2d..6929cb46e6 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
@@ -33,7 +33,7 @@ import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.xml.bind.gts.TM_PeriodDuration;
 import org.apache.sis.xml.bind.FilterByVersion;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
index c2c656031d..594ecf473b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
@@ -33,7 +33,7 @@ import org.apache.sis.xml.bind.FilterByVersion;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.bind.metadata.MD_Medium;
 import org.apache.sis.xml.bind.metadata.CI_Citation;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.iso.citation.DefaultCitation;
 import org.apache.sis.metadata.iso.ISOMetadata;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
index b4cf8b090c..eccccdcecb 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
@@ -39,7 +39,7 @@ import org.apache.sis.metadata.iso.legacy.MediumName;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
 import org.apache.sis.xml.util.LegacyNamespaces;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 import static org.apache.sis.metadata.internal.ImplementationHelper.ensurePositive;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
index 5a147dbed9..7706b3433c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/Extents.java
@@ -64,7 +64,7 @@ import org.apache.sis.util.Static;
 
 import static java.lang.Math.*;
 import static org.apache.sis.util.collection.Containers.isNullOrEmpty;
-import static org.apache.sis.internal.util.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.CollectionsExt.nonNull;
 import static org.apache.sis.metadata.internal.ReferencingServices.AUTHALIC_RADIUS;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
index 30209dba39..f72d3d933d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
@@ -32,7 +32,7 @@ import org.apache.sis.xml.bind.metadata.SV_OperationMetadata;
 import org.apache.sis.xml.bind.FilterByVersion;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.bind.gco.GO_GenericName;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.iso.Names;
 import org.apache.sis.xml.Namespaces;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
index 219330c2ee..8054456de4 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
@@ -34,7 +34,7 @@ import org.apache.sis.xml.bind.IdentifierMapAdapter;
 import org.apache.sis.xml.bind.gco.GO_Integer64;
 import org.apache.sis.metadata.internal.ImplementationHelper;
 import org.apache.sis.metadata.internal.Resources;
-import org.apache.sis.internal.util.CheckedArrayList;
+import org.apache.sis.util.internal.CheckedArrayList;
 import org.apache.sis.measure.ValueRange;
 import org.apache.sis.xml.IdentifierMap;
 import org.apache.sis.xml.IdentifierSpace;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
index c98fd8f500..0d1c63c5cb 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/OperationName.java
@@ -25,7 +25,7 @@ import org.opengis.metadata.citation.OnlineResource;
 import org.opengis.metadata.identification.CoupledResource;
 import org.opengis.metadata.identification.DistributedComputingPlatform;
 import org.opengis.metadata.identification.OperationMetadata;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java
index c6af049f1d..eae70c3996 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/LegacyPropertyAdapter.java
@@ -22,7 +22,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Objects;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.util.AbstractIterator;
+import org.apache.sis.util.internal.AbstractIterator;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Emptiable;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java
index 4cea7d25b3..ccfce496a8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/legacy/MediumName.java
@@ -22,7 +22,7 @@ import org.opengis.annotation.UML;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.util.CodeList;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.CodeLists;
+import org.apache.sis.util.internal.CodeLists;
 import org.apache.sis.util.iso.Types;
 
 import static org.opengis.annotation.Obligation.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
index de90bfd962..678015b68a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
@@ -39,7 +39,7 @@ import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.xml.bind.FilterByVersion;
 import org.apache.sis.xml.util.LegacyNamespaces;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 import static org.apache.sis.metadata.internal.ImplementationHelper.valueIfDefined;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
index ccf8330fc1..086c106a72 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
@@ -27,7 +27,7 @@ import org.opengis.metadata.maintenance.ScopeDescription;
 import org.apache.sis.metadata.iso.ISOMetadata;
 import org.apache.sis.metadata.internal.ExcludedSet;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.system.Semaphores;
 import org.apache.sis.util.collection.CheckedContainer;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.iso.Types;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
index e8b4533b0d..99b5893177 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultEvaluationMethod.java
@@ -31,8 +31,8 @@ import org.opengis.metadata.quality.EvaluationMethod;
 import org.opengis.metadata.quality.EvaluationMethodType;
 import org.opengis.metadata.quality.DataEvaluation;
 import org.opengis.metadata.quality.AggregationDerivation;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.util.CloneAccess;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.util.internal.CloneAccess;
 import org.apache.sis.util.collection.CheckedContainer;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
index 1fb30bf763..1a4740d7a8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultMeasureReference.java
@@ -25,7 +25,7 @@ import org.opengis.util.InternationalString;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.quality.Element;
 import org.opengis.metadata.quality.MeasureReference;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java
index ff2aa5a343..068e1bb3a9 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/quality/DefaultScope.java
@@ -23,7 +23,7 @@ import org.opengis.metadata.quality.Scope;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/CitationConstant.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/CitationConstant.java
index 4978678b32..d3eec4c8da 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/CitationConstant.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/CitationConstant.java
@@ -33,8 +33,8 @@ import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.metadata.sql.MetadataSource;
 import org.apache.sis.metadata.sql.MetadataStoreException;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.logging.Logging;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
index 45df127c55..d3e52cde14 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleCitation.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleDuration.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleDuration.java
index abf8958b9b..c3424ca038 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleDuration.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleDuration.java
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.metadata.simple;
 
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.opengis.temporal.Duration;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
index 6dce86c179..916ada5d00 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleExtent.java
@@ -22,7 +22,7 @@ import org.opengis.metadata.extent.GeographicExtent;
 import org.opengis.metadata.extent.TemporalExtent;
 import org.opengis.metadata.extent.VerticalExtent;
 
-import static org.apache.sis.internal.util.CollectionsExt.singletonOrEmpty;
+import static org.apache.sis.util.internal.CollectionsExt.singletonOrEmpty;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
index 36e0721ff5..f24b111858 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleFormat.java
@@ -21,7 +21,7 @@ import java.util.Collections;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.distribution.Format;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
index 853281d116..ed3d7f342b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java
@@ -24,7 +24,7 @@ import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.extent.Extent;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.metadata.internal.Identifiers;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.ComparisonMode;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java
index 60cf3a0f08..10f856cecd 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifier.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.Deprecable;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java
index 55463997c8..015ed9029a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/CachedStatement.java
@@ -26,7 +26,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java
index 125533706b..ed50b6d3db 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/Dispatcher.java
@@ -24,14 +24,14 @@ import java.util.Map;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.ModifiableMetadata;
 import org.apache.sis.metadata.MetadataStandard;
 import org.apache.sis.metadata.KeyNamePolicy;
 import org.apache.sis.metadata.ValueExistencePolicy;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.system.Semaphores;
 import org.apache.sis.metadata.internal.Dependencies;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
index f651c5a23a..6847c67d4a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataFallback.java
@@ -24,7 +24,7 @@ import org.apache.sis.metadata.iso.DefaultIdentifier;
 import org.apache.sis.metadata.iso.citation.DefaultCitation;
 import org.apache.sis.metadata.iso.citation.DefaultOrganisation;
 import org.apache.sis.metadata.iso.citation.DefaultResponsibility;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.xml.NilReason;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
index 7b5bff4b3c..224dcce84e 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataSource.java
@@ -52,19 +52,19 @@ import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.metadata.MetadataStandard;
 import org.apache.sis.metadata.KeyNamePolicy;
 import org.apache.sis.metadata.ValueExistencePolicy;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.system.DelayedExecutor;
-import org.apache.sis.internal.system.DelayedRunnable;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.system.DelayedExecutor;
+import org.apache.sis.system.DelayedRunnable;
 import org.apache.sis.metadata.sql.util.Initializer;
 import org.apache.sis.metadata.sql.util.Reflection;
 import org.apache.sis.metadata.sql.util.SQLBuilder;
 import org.apache.sis.metadata.internal.ReferencingServices;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.collection.CodeListSet;
 import org.apache.sis.util.collection.WeakValueHashMap;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
index 65f0530eee..c5caf8c263 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/MetadataWriter.java
@@ -50,8 +50,8 @@ import org.apache.sis.metadata.TitleProperty;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.metadata.sql.util.SQLBuilder;
 import org.apache.sis.metadata.sql.util.Reflection;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.xml.IdentifiedObject;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/Initializer.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/Initializer.java
index 91831df8a8..14cb476685 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/Initializer.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/Initializer.java
@@ -38,15 +38,15 @@ import javax.naming.event.NamingEvent;
 import javax.naming.event.NamingExceptionEvent;
 import javax.naming.event.ObjectChangeListener;
 import org.apache.sis.setup.InstallationResources;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.DataDirectory;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.system.Shutdown;
-import org.apache.sis.internal.system.Reflect;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.DataDirectory;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.system.Shutdown;
+import org.apache.sis.system.Reflect;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.logging.Logging;
 
-import static org.apache.sis.internal.util.MetadataServices.EMBEDDED;
+import static org.apache.sis.util.internal.MetadataServices.EMBEDDED;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/LocalDataSource.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/LocalDataSource.java
index 5ebfb3232b..33c0ebed0a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/LocalDataSource.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/LocalDataSource.java
@@ -31,10 +31,10 @@ import java.util.logging.Logger;
 import java.util.logging.LogRecord;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.system.DataDirectory;
-import org.apache.sis.internal.system.Reflect;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.system.DataDirectory;
+import org.apache.sis.system.Reflect;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java
index 5d87f9a7f5..0a69989072 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameFactory.java
@@ -37,7 +37,7 @@ import org.apache.sis.util.UnknownNameException;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java
index 6619183e5f..eba77fe130 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultNameSpace.java
@@ -23,7 +23,7 @@ import java.util.Locale;
 import java.util.Objects;
 import java.io.Serializable;
 import java.io.ObjectStreamException;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.opengis.util.NameSpace;
 import org.opengis.util.LocalName;
 import org.opengis.util.ScopedName;
@@ -31,7 +31,7 @@ import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.SimpleInternationalString;
 import org.apache.sis.util.collection.WeakValueHashMap;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java
index 457982defc..ed3b64eac1 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecord.java
@@ -32,8 +32,8 @@ import org.opengis.util.RecordType;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.AbstractMapEntry;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.AbstractMapEntry;
 import org.apache.sis.metadata.internal.RecordSchemaSIS;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
index 993fabb386..6cadbeb7d5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordSchema.java
@@ -36,8 +36,8 @@ import org.apache.sis.util.ObjectConverters;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.WeakValueHashMap;
 import org.apache.sis.metadata.simple.SimpleAttributeType;
-import org.apache.sis.internal.converter.SurjectiveConverter;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.converter.SurjectiveConverter;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
index bb3ef710a7..2ebd322b36 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultRecordType.java
@@ -43,7 +43,7 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.ObjectConverters;
-import org.apache.sis.internal.converter.SurjectiveConverter;
+import org.apache.sis.converter.SurjectiveConverter;
 import org.apache.sis.metadata.internal.RecordSchemaSIS;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java
index 65d91752b8..1a74597b48 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/DefaultScopedName.java
@@ -27,7 +27,7 @@ import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
index 96dd92dcb9..5116ccd42b 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/RecordDefinition.java
@@ -31,7 +31,7 @@ import org.apache.sis.util.Classes;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.collection.Containers;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java
index 308c555238..112de9547c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/TypeNames.java
@@ -29,7 +29,7 @@ import org.opengis.util.NameSpace;
 import org.opengis.util.NameFactory;
 import org.opengis.util.InternationalString;
 import org.opengis.geometry.Geometry;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Numbers;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
index 4454c74b12..a1742a5931 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/util/iso/Types.java
@@ -46,8 +46,8 @@ import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.internal.util.CodeLists;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.util.internal.CodeLists;
+import org.apache.sis.system.Modules;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java
index b42a94c73a..20605b9a59 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/MarshallerPool.java
@@ -26,14 +26,14 @@ import jakarta.xml.bind.JAXBException;
 import jakarta.xml.bind.Marshaller;
 import jakarta.xml.bind.Unmarshaller;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Reflect;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.DelayedExecutor;
-import org.apache.sis.internal.system.DelayedRunnable;
+import org.apache.sis.system.Reflect;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.DelayedExecutor;
+import org.apache.sis.system.DelayedRunnable;
 import org.apache.sis.xml.bind.AdapterReplacement;
 import org.apache.sis.xml.bind.TypeRegistration;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.CharSequences;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java
index 25dd5c2642..37ad487c12 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/NilObjectHandler.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.xml.bind.IdentifierMapAdapter;
 import org.apache.sis.xml.bind.ModifiableIdentifierMap;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java
index 224058c7a6..fde5b98e92 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/Pooled.java
@@ -36,7 +36,7 @@ import org.apache.sis.util.Version;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.bind.TypeRegistration;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
index 622ae65f08..d38dfbe18a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/TransformingWriter.java
@@ -37,7 +37,7 @@ import javax.xml.stream.events.Namespace;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.namespace.QName;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.util.LegacyNamespaces;
 
 import static javax.xml.stream.XMLStreamConstants.*;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java
index 4e60b4efe9..1ae2fa9eac 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/ValueConverter.java
@@ -28,7 +28,7 @@ import java.nio.charset.Charset;
 import java.nio.charset.IllegalCharsetNameException;
 import javax.measure.Unit;
 import javax.measure.format.MeasurementParseException;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.Locales;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
index 0e6a1c39bb..0e68b29b8c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XML.java
@@ -45,8 +45,8 @@ import org.apache.sis.util.Static;
 import org.apache.sis.util.Version;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.SystemListener;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.SystemListener;
 import org.apache.sis.xml.bind.TypeRegistration;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java
index 110d7ef07c..557430692d 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/XPointer.java
@@ -17,7 +17,7 @@
 package org.apache.sis.xml;
 
 import static org.apache.sis.util.CharSequences.*;
-import static org.apache.sis.internal.util.DefinitionURI.regionMatches;
+import static org.apache.sis.util.internal.DefinitionURI.regionMatches;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
index 98d9c2488a..7db3f56c7c 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/Context.java
@@ -35,8 +35,8 @@ import org.apache.sis.util.resources.IndexedResourceBundle;
 import org.apache.sis.util.CorruptedObjectException;
 import org.apache.sis.xml.bind.gco.PropertyType;
 import org.apache.sis.xml.util.LegacyNamespaces;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.xml.MarshalContext;
 import org.apache.sis.xml.ValueConverter;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java
index 990e889a94..c9553358cd 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/IdentifierMapAdapter.java
@@ -32,8 +32,8 @@ import org.opengis.metadata.citation.Citation;
 import org.apache.sis.xml.XLink;
 import org.apache.sis.xml.IdentifierMap;
 import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.SetOfUnknownSize;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.SetOfUnknownSize;
 
 import static org.apache.sis.util.collection.Containers.hashMapCapacity;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java
index a95ce01c5a..4264ee1a24 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/NonMarshalledAuthority.java
@@ -27,8 +27,8 @@ import java.io.ObjectStreamException;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.apache.sis.metadata.simple.CitationConstant;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.xml.IdentifierSpace;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
index 2a725c0406..29f9e065ae 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/SpecializedIdentifier.java
@@ -28,7 +28,7 @@ import org.apache.sis.xml.IdentifierMap;
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.xml.ValueConverter;
 import org.apache.sis.util.resources.Messages;
-import org.apache.sis.internal.util.CloneAccess;
+import org.apache.sis.util.internal.CloneAccess;
 import org.apache.sis.metadata.iso.citation.Citations;
 
 // Branch-dependent imports
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/TypeRegistration.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/TypeRegistration.java
index 92a97bc9fc..f5a231a48a 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/TypeRegistration.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/TypeRegistration.java
@@ -31,11 +31,11 @@ import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.Reflect;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.system.DelayedExecutor;
-import org.apache.sis.internal.system.DelayedRunnable;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.Reflect;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.system.DelayedExecutor;
+import org.apache.sis.system.DelayedRunnable;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java
index d9e179f814..95f4f95521 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/CharSequenceAdapter.java
@@ -21,7 +21,7 @@ import org.opengis.util.InternationalString;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.xml.XLink;
 import org.apache.sis.xml.ReferenceResolver;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.xml.bind.FilterByVersion;
 import org.apache.sis.xml.bind.gcx.Anchor;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java
index c94d0e60fa..e0b5ec6741 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gco/PropertyType.java
@@ -30,7 +30,7 @@ import org.apache.sis.xml.IdentifierMap;
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.xml.IdentifiedObject;
 import org.apache.sis.xml.ReferenceResolver;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.xml.bind.FilterByVersion;
 import org.apache.sis.util.SimpleInternationalString;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java
index c8d6e71236..782aa7a838 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/Measure.java
@@ -27,8 +27,8 @@ import jakarta.xml.bind.annotation.XmlValue;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.xml.bind.cat.CodeListUID;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.DefinitionURI;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.DefinitionURI;
 import org.apache.sis.measure.UnitFormat;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/SC_VerticalCRS.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/SC_VerticalCRS.java
index faedd2e5c5..7eae4e1c65 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/SC_VerticalCRS.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/SC_VerticalCRS.java
@@ -20,7 +20,7 @@ import jakarta.xml.bind.annotation.XmlAnyElement;
 import org.opengis.referencing.crs.VerticalCRS;
 import org.apache.sis.xml.bind.gco.PropertyType;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Classes;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java
index dc4e4496e3..8771733ee7 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java
@@ -24,7 +24,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.datatype.DatatypeConfigurationException;
 import org.opengis.temporal.Instant;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.xml.util.XmlUtilities;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
index 2147acb740..dc75b577d0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriod.java
@@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlElements;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import org.opengis.temporal.Period;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 import static org.apache.sis.xml.util.LegacyNamespaces.VERSION_3_0;
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java
index 8cabc7f1c2..5ecb429eca 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/UniversalTimeAdapter.java
@@ -45,7 +45,7 @@ public final class UniversalTimeAdapter extends XmlAdapter<XMLGregorianCalendar,
     /**
      * The timezone of the date to marshal with this adapter.
      */
-    private static final TimeZone UTC = TimeZone.getTimeZone(org.apache.sis.internal.util.StandardDateFormat.UTC);
+    private static final TimeZone UTC = TimeZone.getTimeZone(org.apache.sis.util.internal.StandardDateFormat.UTC);
 
     /**
      * Empty constructor for JAXB only.
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java
index 7e0eb45da0..6090083944 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/Country.java
@@ -26,7 +26,7 @@ import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.bind.cat.CodeListUID;
 import org.apache.sis.xml.bind.gco.GO_CharacterString;
 import org.apache.sis.xml.bind.gco.CharSequenceAdapter;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java
index 1fccb311da..fc9c2abfa3 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java
@@ -25,8 +25,8 @@ import java.util.Collections;
 import java.util.Locale;
 import java.nio.charset.Charset;
 import java.util.Iterator;
-import org.apache.sis.internal.util.Bag;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.Bag;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.collection.TableColumn;
 import org.apache.sis.util.collection.TreeTable.Node;
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java
index 8f766279b3..7a426188c8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/lan/PT_Locale.java
@@ -30,7 +30,7 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.apache.sis.xml.bind.metadata.code.MD_CharacterSetCode;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
index ae54254fb3..a94c4148c8 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ServiceParameter.java
@@ -35,7 +35,7 @@ import org.apache.sis.util.iso.DefaultMemberName;
 import org.apache.sis.util.iso.Names;
 import org.apache.sis.xml.Namespaces;
 
-import static org.apache.sis.internal.util.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.CollectionsExt.nonNull;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/XmlUtilities.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/XmlUtilities.java
index 9bceeffe60..4b4df663a5 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/XmlUtilities.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/XmlUtilities.java
@@ -38,8 +38,8 @@ import java.util.function.ObjIntConsumer;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.DatatypeConfigurationException;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.system.Modules;
 import org.apache.sis.xml.bind.Context;
 
 import static javax.xml.datatype.DatatypeConstants.FIELD_UNDEFINED;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
index 5657fd4c80..34363271df 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyConsistencyCheck.java
@@ -27,7 +27,7 @@ import org.opengis.util.ControlledVocabulary;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.collection.CheckedContainer;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.internal.Dependencies;
 import org.apache.sis.test.xml.AnnotationConsistencyCheck;
 import org.apache.sis.test.TestUtilities;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
index d19dab1086..461e17aacc 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/CitationsTest.java
@@ -28,7 +28,7 @@ import org.opengis.metadata.citation.Citation;
 import org.apache.sis.metadata.iso.DefaultIdentifier;
 import org.apache.sis.metadata.simple.CitationConstant;
 import org.apache.sis.metadata.simple.SimpleCitation;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 1ad9ebac27..b49573df0b 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@ -34,7 +34,7 @@ import org.opengis.metadata.citation.Responsibility;
 import org.opengis.metadata.citation.OnLineFunction;
 import org.opengis.metadata.citation.OnlineResource;
 import org.opengis.metadata.citation.PresentationForm;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.IdentifierMap;
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.metadata.MetadataCopier;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
index af78248a9c..edb25c2302 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
@@ -23,8 +23,8 @@ import org.opengis.metadata.citation.OnLineFunction;
 import org.opengis.metadata.citation.PresentationForm;
 import org.apache.sis.metadata.iso.DefaultIdentifier;
 import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.URLs;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.URLs;
 import org.apache.sis.util.Static;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
index 78f0b57670..8a6e42c476 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataFallbackVerifier.java
@@ -29,7 +29,7 @@ import org.apache.sis.test.sql.TestDatabase;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static org.apache.sis.internal.util.CollectionsExt.first;
+import static org.apache.sis.util.internal.CollectionsExt.first;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
index 2a375cc368..2e980a5832 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/MetadataWriterTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.test.sql.TestDatabase;
 import org.apache.sis.metadata.iso.citation.HardCodedCitations;
 import org.apache.sis.metadata.iso.citation.DefaultTelephone;
 import org.apache.sis.metadata.MetadataStandard;
-import org.apache.sis.internal.util.URLs;
+import org.apache.sis.util.internal.URLs;
 import org.apache.sis.test.TestUtilities;
 import org.apache.sis.test.TestCase;
 import org.apache.sis.test.DependsOn;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
index 74ded3e07c..6d2c7194fe 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/SchemaComplianceTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.metadata.xml;
 import java.nio.file.Path;
 import java.nio.file.Files;
 import org.apache.sis.metadata.iso.ISOMetadata;
-import org.apache.sis.internal.system.DataDirectory;
+import org.apache.sis.system.DataDirectory;
 import org.apache.sis.test.ProjectDirectories;
 import org.apache.sis.test.xml.SchemaCompliance;
 import org.apache.sis.test.TestCase;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java
index 21dc2d6e5d..d5161bf17c 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/mock/IdentifiedObjectMock.java
@@ -25,8 +25,8 @@ import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.opengis.util.GenericName;
 import org.opengis.metadata.Identifier;
 import org.opengis.referencing.IdentifiedObject;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.bind.gco.GO_GenericName;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/DocumentComparator.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/DocumentComparator.java
index 542fbee0e2..cb1c04e180 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/DocumentComparator.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/DocumentComparator.java
@@ -44,7 +44,7 @@ import org.w3c.dom.Text;
 import org.xml.sax.SAXException;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.xml.util.LegacyNamespaces;
 
 import static java.lang.StrictMath.*;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/PackageVerifier.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/PackageVerifier.java
index cb6bc5cc76..7e3055a252 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/PackageVerifier.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/test/xml/PackageVerifier.java
@@ -40,7 +40,7 @@ import org.opengis.annotation.UML;
 import org.opengis.geoapi.SchemaException;
 import org.opengis.geoapi.SchemaInformation;
 import org.apache.sis.util.Classes;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.Namespaces;
 
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java
index bbfc8bf470..6b71cee384 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/DefaultLocalNameTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.opengis.test.Validators.validate;
 import static org.apache.sis.test.Assertions.assertSerializedEquals;
-import static org.apache.sis.internal.util.Constants.EPSG;
+import static org.apache.sis.util.internal.Constants.EPSG;
 import static org.apache.sis.util.iso.DefaultNameSpace.DEFAULT_SEPARATOR_STRING;
 
 
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java
index 7686934a3d..fd9caa0a89 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/util/iso/TypeNamesTest.java
@@ -30,7 +30,7 @@ import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static org.apache.sis.internal.util.Constants.OGC;
+import static org.apache.sis.util.internal.Constants.OGC;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
index b2460d257d..cd69a4f793 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.xml.XML;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.xml.MarshallerPool;
 import org.apache.sis.xml.util.XmlUtilities;
-import org.apache.sis.internal.temporal.DefaultTemporalFactory;
+import org.apache.sis.pending.temporal.DefaultTemporalFactory;
 import org.apache.sis.test.xml.TestCase;
 import org.junit.BeforeClass;
 import org.junit.AfterClass;
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
index b152ae8f08..265196db54 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/lan/LanguageCodeTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.apache.sis.metadata.Assertions.assertXmlEquals;
 import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.internal.util.StandardDateFormat.UTC;
+import static org.apache.sis.util.internal.StandardDateFormat.UTC;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/SymbologyVisitor.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/SymbologyVisitor.java
index 800865d90e..ee26c37558 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/SymbologyVisitor.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/SymbologyVisitor.java
@@ -24,7 +24,7 @@ import org.opengis.filter.ValueReference;
 import org.apache.sis.style.se1.*;
 import org.apache.sis.style.Style;
 
-import static org.apache.sis.internal.util.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.CollectionsExt.nonNull;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java
index 27d096675f..0a1b3dec19 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/MultiResolutionCoverageLoader.java
@@ -36,7 +36,7 @@ import org.apache.sis.coverage.grid.GridCoverage;
 import org.apache.sis.coverage.grid.GridRoundingMode;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.io.TableAppender;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.system.Configuration;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/RenderingData.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/RenderingData.java
index 0fc398e040..bbf4671cb1 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/RenderingData.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/internal/map/coverage/RenderingData.java
@@ -56,8 +56,8 @@ import org.apache.sis.coverage.internal.SampleDimensions;
 import org.apache.sis.coverage.grid.j2d.ColorModelType;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.referencing.util.WraparoundApplicator;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.CloneAccess;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.CloneAccess;
 import org.apache.sis.io.TableAppender;
 import org.apache.sis.math.Statistics;
 import org.apache.sis.measure.Quantities;
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java
index aba2e4f1d4..e307cfdaab 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java
@@ -54,7 +54,7 @@ import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.util.WraparoundApplicator;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.coverage.grid.IncompleteGridGeometryException;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
index 9dca3f3d3a..aa11bafb7d 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasContext.java
@@ -34,7 +34,7 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.referencing.operation.transform.LinearTransform;
 
 
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java
index ea6edf202d..a83bc88641 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/CanvasExtent.java
@@ -33,7 +33,7 @@ import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Observable.java b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Observable.java
index 2347f18d0e..4824198940 100644
--- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Observable.java
+++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Observable.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.logging.Logger;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
 
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
index 966f5ff70f..862bd0ba4b 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/FinalLocationType.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.extent.Extent;
 import org.opengis.metadata.extent.GeographicExtent;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.metadata.ModifiableMetadata;
 import org.apache.sis.metadata.MetadataCopier;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java
index 11b8997893..972fafe253 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GazetteerFactory.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.LinkedHashSet;
 import java.util.Optional;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.gazetteer.internal.Resources;
 import org.apache.sis.util.iso.AbstractFactory;
 import org.apache.sis.util.iso.DefaultNameSpace;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
index 4c3beb0716..84cf0db8fb 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/GeohashReferenceSystem.java
@@ -37,7 +37,7 @@ import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.cs.AxesConvention;
 import org.apache.sis.referencing.crs.DefaultGeographicCRS;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
index 8eb81af2c0..8a3545bf1a 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/MilitaryGridReferenceSystem.java
@@ -72,7 +72,7 @@ import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.Envelope2D;
 import org.apache.sis.geometry.DirectPosition2D;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.measure.Latitude;
diff --git a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
index dc4a1c5b86..efda18e24a 100644
--- a/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
+++ b/endorsed/src/org.apache.sis.referencing.gazetteer/main/org/apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java
@@ -40,8 +40,8 @@ import org.apache.sis.io.wkt.ElementKind;
 import org.apache.sis.metadata.iso.extent.Extents;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.util.WKTUtilities;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.util.resources.Vocabulary;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
index c1080e200d..0291470ea3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractDirectPosition.java
@@ -34,7 +34,7 @@ import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.io.wkt.FormattableObject;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java
index 9f55f209bc..4fd6aca806 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/AbstractEnvelope.java
@@ -44,13 +44,13 @@ import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.TemporalAccessor;
-import org.apache.sis.internal.util.ArgumentCheckByAssertion;
+import org.apache.sis.util.internal.ArgumentCheckByAssertion;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.measure.Range;
 import org.apache.sis.math.Vector;
 
 import static java.lang.Double.doubleToLongBits;
-import static org.apache.sis.internal.util.Numerics.SIGN_BIT_MASK;
+import static org.apache.sis.util.internal.Numerics.SIGN_BIT_MASK;
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
 import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches;
 import static org.apache.sis.util.StringBuilders.trimFractionalPart;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java
index 6b95960c3a..67cfde56ce 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/CoordinateFormat.java
@@ -50,9 +50,9 @@ import org.opengis.referencing.datum.Ellipsoid;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.util.ReferencingUtilities;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.LocalizedParseException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.LocalizedParseException;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java
index 3895022706..e91ac5934b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelopes.java
@@ -51,8 +51,8 @@ import org.apache.sis.metadata.internal.ReferencingServices;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.util.TemporalAccessor;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
index 6c7c8a2179..6ae719b005 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/GeneralEnvelope.java
@@ -37,7 +37,7 @@ import org.opengis.geometry.MismatchedReferenceSystemException;
 import org.opengis.metadata.extent.GeographicBoundingBox;
 import org.apache.sis.referencing.util.TemporalAccessor;
 import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.internal.util.ArgumentCheckByAssertion;
+import org.apache.sis.util.internal.ArgumentCheckByAssertion;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.IdentifiedObjects;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java
index fbe34851fd..9be3560f54 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/AbstractParser.java
@@ -33,8 +33,8 @@ import javax.measure.Unit;
 import javax.measure.format.MeasurementParseException;
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.measure.Units;
 import org.apache.sis.measure.UnitFormat;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java
index 09f4dfb349..13093eda6b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Colors.java
@@ -19,7 +19,7 @@ package org.apache.sis.io.wkt;
 import java.util.EnumMap;
 import java.io.Serializable;
 import java.io.ObjectStreamException;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 import org.apache.sis.util.resources.Errors;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java
index 099e23c615..ecfba63597 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Element.java
@@ -31,7 +31,7 @@ import org.apache.sis.util.Exceptions;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 import static org.apache.sis.util.CharSequences.skipLeadingWhitespaces;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java
index 43dc43b42f..ee68bd05db 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/FormattableObject.java
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicReference;
 import jakarta.xml.bind.annotation.XmlTransient;
 import org.apache.sis.util.Debug;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.X364;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.X364;
+import org.apache.sis.util.internal.Constants;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index ed52136ffa..26bca74967 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@ -70,11 +70,11 @@ import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.collection.IntegerList;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.X364;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.util.internal.X364;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.metadata.simple.SimpleExtent;
 import org.apache.sis.metadata.internal.Resources;
 import org.apache.sis.referencing.util.WKTKeywords;
@@ -129,13 +129,13 @@ public class Formatter implements Localized {
 
     /**
      * The value of {@code X364.FOREGROUND_DEFAULT.sequence()}, hard-coded for avoiding
-     * {@link org.apache.sis.internal.util.X364} class loading.
+     * {@link org.apache.sis.util.internal.X364} class loading.
      */
     static final String FOREGROUND_DEFAULT = "\u001B[39m";
 
     /**
      * The value of {@code X364.BACKGROUND_DEFAULT.sequence()}, hard-coded for avoiding
-     * {@link org.apache.sis.internal.util.X364} class loading.
+     * {@link org.apache.sis.util.internal.X364} class loading.
      */
     static final String BACKGROUND_DEFAULT = "\u001B[49m";
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
index bbd95d94a0..dbb3d24101 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java
@@ -81,9 +81,9 @@ import org.apache.sis.referencing.internal.VerticalDatumTypes;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.iso.Types;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
index 399a240d4f..c1d496dd57 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/MathTransformParser.java
@@ -40,7 +40,7 @@ import org.opengis.referencing.operation.OperationMethod;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.measure.UnitFormat;
 import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
index 0ad74dbe78..5ca516cefc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTDictionary.java
@@ -43,9 +43,9 @@ import org.apache.sis.referencing.factory.FactoryDataException;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.metadata.iso.DefaultIdentifier;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
index 6ef7301af9..6cb8fa4508 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/WKTFormat.java
@@ -52,9 +52,9 @@ import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.referencing.ImmutableIdentifier;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
index 8b4443b9fc..212b66a947 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
@@ -34,7 +34,7 @@ import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.measure.Range;
 import org.apache.sis.measure.MeasurementRange;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.xml.bind.gco.PropertyType;
 import org.apache.sis.xml.bind.metadata.replace.QualityParameter;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
index 00216725ae..32aff1e7ab 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
@@ -34,7 +34,7 @@ import org.apache.sis.xml.bind.referencing.CC_OperationParameterGroup;
 import org.apache.sis.metadata.internal.ImplementationHelper;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
index 0e80a83778..15fde2d64e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterValue.java
@@ -47,8 +47,8 @@ import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.metadata.internal.ImplementationHelper;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java
index d310cc5909..2771bf6070 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/FilteredParameters.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.function.Predicate;
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.opengis.parameter.GeneralParameterValue;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.ComparisonMode;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java
index 997cbb1319..3aac40a212 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionDescriptor.java
@@ -24,7 +24,7 @@ import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.opengis.parameter.ParameterNotFoundException;
 import org.apache.sis.referencing.operation.provider.MapProjection;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.Workaround;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java
index e3b985f578..de1d577db5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MapProjectionParameters.java
@@ -24,7 +24,7 @@ import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterNotFoundException;
 import org.apache.sis.referencing.NamedIdentifier;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
index 41097fbaa5..aee320fb2c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParameters.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.io.ObjectStreamException;
 import org.opengis.parameter.ParameterDescriptor;
 import org.apache.sis.referencing.NamedIdentifier;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.operation.provider.Affine;
 import org.apache.sis.metadata.iso.citation.Citations;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java
index d29cc13355..faa55d8d0f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/MatrixParametersAlphaNum.java
@@ -21,10 +21,10 @@ import java.util.HashMap;
 import java.io.ObjectStreamException;
 import org.opengis.util.GenericName;
 import org.opengis.parameter.ParameterDescriptor;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.operation.provider.EPSGName;
 
-import static org.apache.sis.internal.util.CollectionsExt.first;
+import static org.apache.sis.util.internal.CollectionsExt.first;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java
index 4ac84fc141..d7e6ae14ea 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterFormat.java
@@ -56,8 +56,8 @@ import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.metadata.internal.NameToIdentifier;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.X364;
 
 import static org.apache.sis.util.collection.Containers.hashMapCapacity;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java
index 62c47c9ee1..1d45d757d5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java
@@ -41,11 +41,11 @@ import org.apache.sis.util.Deprecable;
 import org.apache.sis.measure.Range;
 import org.apache.sis.measure.RangeFormat;
 import org.apache.sis.metadata.internal.NameToIdentifier;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 
-import static org.apache.sis.internal.util.X364.*;
+import static org.apache.sis.util.internal.X364.*;
 import static org.apache.sis.util.CharSequences.spaces;
-import static org.apache.sis.internal.util.Constants.DEFAULT_SEPARATOR;
+import static org.apache.sis.util.internal.Constants.DEFAULT_SEPARATOR;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
index 1e1012eb95..63acd2b972 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorParameters.java
@@ -39,7 +39,7 @@ import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.provider.Affine;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.util.Numbers;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java
index eb3cb7ef8d..04a40acf3a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/TensorValues.java
@@ -36,9 +36,9 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.CloneAccess;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.CloneAccess;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.Classes;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java
index feeebc7e83..79fb2c3e9e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UninitializedParameter.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.opengis.parameter.GeneralParameterValue;
 import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java
index 6f1d1233a9..81c875d767 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValue.java
@@ -19,7 +19,7 @@ package org.apache.sis.parameter;
 import javax.measure.Unit;
 import jakarta.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterValue;
-import org.apache.sis.internal.util.Cloner;
+import org.apache.sis.util.internal.Cloner;
 import org.apache.sis.util.collection.WeakHashSet;
 import org.apache.sis.util.resources.Errors;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
index 432a0ecc30..d68257dcc2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java
index 86297ae4a9..9a5909ae2c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/Verifier.java
@@ -30,8 +30,8 @@ import org.opengis.parameter.GeneralParameterDescriptor;
 import org.opengis.parameter.InvalidParameterValueException;
 import org.apache.sis.referencing.internal.EPSGParameterDomain;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.measure.Range;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.Numbers;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 2d87b7e5c9..36e19ad039 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@ -45,8 +45,8 @@ import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.xml.bind.UseLegacyMetadata;
 import org.apache.sis.xml.bind.referencing.Code;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.metadata.internal.NameToIdentifier;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.metadata.internal.ImplementationHelper;
@@ -64,9 +64,9 @@ import org.apache.sis.util.resources.Errors;
 
 import static org.apache.sis.util.ArgumentChecks.*;
 import static org.apache.sis.util.Utilities.deepEquals;
-import static org.apache.sis.internal.util.CollectionsExt.nonNull;
-import static org.apache.sis.internal.util.CollectionsExt.nonEmpty;
-import static org.apache.sis.internal.util.CollectionsExt.immutableSet;
+import static org.apache.sis.util.internal.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.CollectionsExt.nonEmpty;
+import static org.apache.sis.util.internal.CollectionsExt.immutableSet;
 
 
 /**
@@ -941,7 +941,7 @@ public class AbstractIdentifiedObject extends FormattableObject implements Ident
      * elements separated by hyphens:</p>
      * <ul>
      *   <li>The code space in lower case, retaining only characters that are valid for Unicode identifiers.</li>
-     *   <li>The object type as defined in OGC's URN (see {@link org.apache.sis.internal.util.DefinitionURI})</li>
+     *   <li>The object type as defined in OGC's URN (see {@link org.apache.sis.util.internal.DefinitionURI})</li>
      *   <li>The object code, retaining only characters that are valid for Unicode identifiers.</li>
      * </ul>
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
index 7d5dc3634a..cf0f2f2f84 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AuthorityFactories.java
@@ -29,10 +29,10 @@ import org.opengis.referencing.crs.CRSAuthorityFactory;
 import org.opengis.referencing.datum.DatumAuthorityFactory;
 import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
 import org.apache.sis.referencing.util.LazySet;
-import org.apache.sis.internal.system.Reflect;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.SystemListener;
+import org.apache.sis.system.Reflect;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.SystemListener;
 import org.apache.sis.referencing.internal.EPSGFactoryProxy;
 import org.apache.sis.referencing.factory.MultiAuthoritiesFactory;
 import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
index 6326682fbf..12ebb89006 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java
@@ -62,9 +62,9 @@ import org.apache.sis.referencing.util.PositionalAccuracyConstant;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.util.DefinitionVerifier;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.referencing.cs.AxisFilter;
 import org.apache.sis.referencing.cs.CoordinateSystems;
 import org.apache.sis.referencing.cs.DefaultVerticalCS;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
index e47e64edc3..b560fb99bb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CommonCRS.java
@@ -71,9 +71,9 @@ import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.operation.provider.TransverseMercator;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.OptionalCandidate;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.resources.Errors;
@@ -87,7 +87,7 @@ import org.apache.sis.measure.Units;
 
 import static java.util.Collections.singletonMap;
 import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
-import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
index badae29d5b..6ec6522a5f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java
@@ -44,10 +44,10 @@ import org.opengis.metadata.citation.Citation;
 import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
 import org.apache.sis.referencing.operation.provider.TransverseMercator;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.Fallback;
-import org.apache.sis.internal.util.MetadataServices;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.URLs;
+import org.apache.sis.system.Fallback;
+import org.apache.sis.util.internal.MetadataServices;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.URLs;
 import org.apache.sis.setup.InstallationResources;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Debug;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
index b3c15ddf20..0440fe4fc4 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/GeodeticCalculator.java
@@ -51,8 +51,8 @@ import org.apache.sis.referencing.util.j2d.ShapeUtilities;
 import org.apache.sis.referencing.util.j2d.Bezier;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
index 65600af48e..86fc896d83 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/IdentifiedObjects.java
@@ -39,9 +39,9 @@ import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.xml.IdentifierSpace;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.DefinitionURI;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.DefinitionURI;
 import org.apache.sis.metadata.internal.Identifiers;
 import org.apache.sis.metadata.internal.NameMeaning;
 import org.apache.sis.metadata.internal.NameToIdentifier;
@@ -50,7 +50,7 @@ import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
 import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
 import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
 
-import static org.apache.sis.internal.util.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.CollectionsExt.nonNull;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
index c08a58be48..ea8f59920e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/ImmutableIdentifier.java
@@ -31,7 +31,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.metadata.internal.Identifiers;
 import org.apache.sis.metadata.internal.NameMeaning;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.io.wkt.Convention;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java
index 0d2b310efb..40b25c22bb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/NameIterator.java
@@ -25,7 +25,7 @@ import org.apache.sis.xml.bind.Context;
 import org.apache.sis.metadata.internal.NameMeaning;
 import org.apache.sis.referencing.util.NilReferencingObject;
 
-import static org.apache.sis.internal.util.Strings.appendUnicodeIdentifier;
+import static org.apache.sis.util.internal.Strings.appendUnicodeIdentifier;
 
 
 /**
@@ -126,7 +126,7 @@ final class NameIterator implements Iterator<Identifier> {
      * Then, this method returns the concatenation of the following elements separated by hyphens:</p>
      * <ul>
      *   <li>The code space in lower case, retaining only characters that are valid for Unicode identifiers.</li>
-     *   <li>The object type as defined in OGC's URN (see {@link org.apache.sis.internal.util.DefinitionURI})</li>
+     *   <li>The object type as defined in OGC's URN (see {@link org.apache.sis.util.internal.DefinitionURI})</li>
      *   <li>The object code, retaining only characters that are valid for Unicode identifiers.</li>
      * </ul>
      *
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
index 9ced8c407d..5daf93eb85 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/Properties.java
@@ -29,7 +29,7 @@ import org.opengis.referencing.operation.CoordinateOperation;
 import org.opengis.referencing.operation.OperationMethod;
 import org.opengis.referencing.operation.SingleOperation;
 import org.opengis.metadata.quality.PositionalAccuracy;
-import org.apache.sis.internal.util.AbstractMap;
+import org.apache.sis.util.internal.AbstractMap;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.util.Deprecable;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/PropertiesConverter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/PropertiesConverter.java
index 7371664816..c355a66dd2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/PropertiesConverter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/PropertiesConverter.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing;
 
 import java.util.Map;
 import org.apache.sis.util.ObjectConverters;
-import org.apache.sis.internal.converter.SurjectiveConverter;
+import org.apache.sis.converter.SurjectiveConverter;
 
 import static org.opengis.metadata.Identifier.CODE_KEY;
 import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
index ef68c94a4b..2715bb4a14 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/StandardDefinitions.java
@@ -40,7 +40,7 @@ import org.opengis.referencing.crs.VerticalCRS;
 import org.opengis.referencing.operation.OperationMethod;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.util.NoSuchIdentifierException;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.internal.AxisNames;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.operation.provider.TransverseMercator;
@@ -100,7 +100,7 @@ final class StandardDefinitions {
     /**
      * The EPSG code for Greenwich meridian.
      *
-     * @see org.apache.sis.internal.util.Constants#EPSG_GREENWICH
+     * @see org.apache.sis.util.internal.Constants#EPSG_GREENWICH
      */
     static final String GREENWICH = "8901";
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
index a2a2b9475d..bcd8c8849f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java
@@ -39,7 +39,7 @@ import org.apache.sis.xml.bind.referencing.CC_Conversion;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.metadata.internal.ImplementationHelper;
 import org.apache.sis.metadata.internal.Identifiers;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.system.Semaphores;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
index 3e534e290f..ea15a09fc4 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java
@@ -45,7 +45,7 @@ import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.ReferencingUtilities;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.xml.bind.referencing.SC_CRS;
 import org.apache.sis.util.collection.CheckedContainer;
 import org.apache.sis.util.collection.Containers;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
index 92c2e38f89..317f1ad5b8 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
@@ -35,11 +35,11 @@ import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.util.resources.Errors;
 
-import static org.apache.sis.internal.util.Constants.CRS;
-import static org.apache.sis.internal.util.Constants.EPSG;
-import static org.apache.sis.internal.util.Constants.CRS27;
-import static org.apache.sis.internal.util.Constants.CRS83;
-import static org.apache.sis.internal.util.Constants.CRS84;
+import static org.apache.sis.util.internal.Constants.CRS;
+import static org.apache.sis.util.internal.Constants.EPSG;
+import static org.apache.sis.util.internal.Constants.CRS27;
+import static org.apache.sis.util.internal.Constants.CRS83;
+import static org.apache.sis.util.internal.Constants.CRS84;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
index 895ed85d7d..0bc1690536 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
@@ -41,8 +41,8 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.math.Fraction;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_SECOND;
-import static org.apache.sis.internal.util.StandardDateFormat.MILLIS_PER_SECOND;
+import static org.apache.sis.util.internal.StandardDateFormat.NANOS_PER_SECOND;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLIS_PER_SECOND;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java
index 07ef5bbc09..4351f9f51f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/ExplicitParameters.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.referencing.util.WKTUtilities;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
index b6bffd46b5..5ca6cbf007 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java
@@ -43,8 +43,8 @@ import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.ElementKind;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.Utilities;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java
index 93e982e852..77ba45c3bf 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Codes.java
@@ -23,8 +23,8 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.util.ArraysExt;
 import org.opengis.referencing.cs.AxisDirection;
 
-import static org.apache.sis.internal.util.Constants.EPSG_METRE;
-import static org.apache.sis.internal.util.Constants.EPSG_AXIS_DEGREES;
+import static org.apache.sis.util.internal.Constants.EPSG_METRE;
+import static org.apache.sis.util.internal.Constants.EPSG_AXIS_DEGREES;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
index 81e53988bc..30a2f045d5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/CoordinateSystems.java
@@ -42,7 +42,7 @@ import org.apache.sis.util.Classes;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.NullArgumentException;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java
index 8252163b8a..bec2b0539f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DefaultCompoundCS.java
@@ -22,7 +22,7 @@ import jakarta.xml.bind.annotation.XmlTransient;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.Workaround;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
index ad06bcb5bd..e42aaeecfc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.cs.AxisDirection;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.measure.Units;
 import org.apache.sis.measure.Longitude;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.io.wkt.FormattableObject;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Normalizer.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Normalizer.java
index cf49c350cc..10ea9678f7 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Normalizer.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/Normalizer.java
@@ -30,7 +30,7 @@ import org.opengis.referencing.cs.EllipsoidalCS;
 import org.opengis.referencing.cs.SphericalCS;
 import org.opengis.referencing.cs.CylindricalCS;
 import org.opengis.referencing.cs.PolarCS;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.IdentifiedObjects;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java
index 9306e6537d..dab1fcfd8d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/BursaWolfParameters.java
@@ -32,7 +32,7 @@ import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.referencing.internal.Resources;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java
index cb767df444..7bcf6ca62f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DatumShiftGrid.java
@@ -31,8 +31,8 @@ import org.apache.sis.referencing.operation.transform.LinearTransform;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java
index 03a672f19f..ea942df5ff 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultEllipsoid.java
@@ -29,8 +29,8 @@ import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.Identifier;
 import org.opengis.referencing.datum.Ellipsoid;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.xml.bind.gml.Measure;
 import org.apache.sis.xml.bind.referencing.SecondDefiningParameter;
 import org.apache.sis.metadata.internal.ImplementationHelper;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
index ee991d6555..a922899e9c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
@@ -45,8 +45,8 @@ import org.apache.sis.metadata.internal.ImplementationHelper;
 import org.apache.sis.referencing.internal.AnnotatedMatrix;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.referencing.util.ExtentSelector;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
index d21c4fd2d9..42bb82629f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.metadata.internal.ImplementationHelper;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.xml.bind.gml.Measure;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java
index dae279cd29..36bdb3c173 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/TimeDependentBWP.java
@@ -20,7 +20,7 @@ import java.util.Date;
 import org.opengis.metadata.extent.Extent;
 import org.opengis.referencing.datum.GeodeticDatum;
 import org.opengis.referencing.datum.PrimeMeridian;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 
 import static org.apache.sis.util.ArgumentChecks.*;
 import static org.apache.sis.referencing.util.Formulas.JULIAN_YEAR_LENGTH;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
index 088010ed1c..3f48f1f1f2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
@@ -29,7 +29,7 @@ import org.opengis.referencing.operation.CoordinateOperationAuthorityFactory;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.internal.NameMeaning;
 import org.apache.sis.referencing.internal.Resources;
 
@@ -105,7 +105,7 @@ final class AuthorityFactoryIdentifier {
      * <h4>Example</h4>
      * In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "EPSG"}.
      *
-     * @see org.apache.sis.internal.util.DefinitionURI
+     * @see org.apache.sis.util.internal.DefinitionURI
      * @see org.apache.sis.metadata.internal.NameMeaning
      */
     private String authority;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
index c37e8be279..75241f2865 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
@@ -30,7 +30,7 @@ import org.opengis.metadata.extent.Extent;
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityCode.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityCode.java
index 9906a6609f..88ddf4e0c0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityCode.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityCode.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.factory;
 import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
index d544008dc7..d5988220bb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/CommonAuthorityFactory.java
@@ -44,7 +44,7 @@ import org.apache.sis.referencing.operation.provider.TransverseMercator.Zoner;
 import org.apache.sis.referencing.util.GeodeticObjectBuilder;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.Units;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.cs.CoordinateSystems;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
index 2b2dc1aaa3..2fede26f81 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
@@ -52,13 +52,13 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.metadata.simple.SimpleCitation;
-import org.apache.sis.internal.system.ReferenceQueueConsumer;
-import org.apache.sis.internal.system.DelayedExecutor;
-import org.apache.sis.internal.system.DelayedRunnable;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.Shutdown;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.system.ReferenceQueueConsumer;
+import org.apache.sis.system.DelayedExecutor;
+import org.apache.sis.system.DelayedRunnable;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.Shutdown;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.util.logging.PerformanceLevel;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Messages;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/FilteredCodes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/FilteredCodes.java
index e021f94e72..6502bf7ce1 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/FilteredCodes.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/FilteredCodes.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.factory;
 
 import java.util.Iterator;
 import java.util.Map;
-import org.apache.sis.internal.util.AbstractMap;
+import org.apache.sis.util.internal.AbstractMap;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
index b2a54c727c..f75a6c4560 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
@@ -31,8 +31,8 @@ import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.AbstractIdentifiedObject;
 import org.apache.sis.util.SimpleInternationalString;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index bbe0ee27db..10c7928cca 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@ -49,8 +49,8 @@ import org.apache.sis.referencing.AbstractIdentifiedObject;
 import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.referencing.internal.MergedProperties;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.system.Semaphores;
 import org.apache.sis.util.collection.WeakHashSet;
 import org.apache.sis.util.iso.AbstractFactory;
 import org.apache.sis.util.resources.Messages;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
index d56fe31052..4c19c3a2ad 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java
@@ -28,8 +28,8 @@ import org.opengis.referencing.AuthorityFactory;
 import org.opengis.referencing.NoSuchAuthorityCodeException;
 import org.apache.sis.referencing.AbstractIdentifiedObject;
 import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.system.Semaphores;
 import org.apache.sis.util.collection.BackingStoreException;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
index 6317f8eb6f..bd187a1065 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/LazySynchronizedIterator.java
@@ -17,7 +17,7 @@
 package org.apache.sis.referencing.factory;
 
 import java.util.Iterator;
-import org.apache.sis.internal.util.AbstractIterator;
+import org.apache.sis.util.internal.AbstractIterator;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
index c90b3dfbc6..d6338fc081 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
@@ -45,11 +45,11 @@ import org.opengis.metadata.extent.Extent;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.util.FactoryException;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.AbstractIterator;
-import org.apache.sis.internal.util.DefinitionURI;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.SetOfUnknownSize;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.AbstractIterator;
+import org.apache.sis.util.internal.DefinitionURI;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.SetOfUnknownSize;
 import org.apache.sis.metadata.internal.NameMeaning;
 import org.apache.sis.referencing.util.LazySet;
 import org.apache.sis.referencing.internal.Resources;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ReferenceKeeper.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ReferenceKeeper.java
index 752f4877b1..2ca3184c41 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ReferenceKeeper.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/ReferenceKeeper.java
@@ -17,10 +17,10 @@
 package org.apache.sis.referencing.factory;
 
 import org.opengis.referencing.IdentifiedObject;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.DelayedExecutor;
-import org.apache.sis.internal.system.DelayedRunnable;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.DelayedExecutor;
+import org.apache.sis.system.DelayedRunnable;
+import org.apache.sis.util.internal.StandardDateFormat;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/AuthorityCodes.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/AuthorityCodes.java
index bcf8bcb5a0..4e84d35bac 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/AuthorityCodes.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/AuthorityCodes.java
@@ -27,7 +27,7 @@ import java.sql.Statement;
 import org.opengis.referencing.operation.Projection;
 import org.apache.sis.util.collection.BackingStoreException;
 import org.apache.sis.util.collection.IntegerList;
-import org.apache.sis.internal.util.AbstractMap;
+import org.apache.sis.util.internal.AbstractMap;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/CloseableReference.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/CloseableReference.java
index 38f1f49082..d3e8434114 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/CloseableReference.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/CloseableReference.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.factory.sql;
 import java.lang.ref.WeakReference;
 import java.sql.SQLException;
 import java.sql.Statement;
-import org.apache.sis.internal.system.ReferenceQueueConsumer;
+import org.apache.sis.system.ReferenceQueueConsumer;
 import org.apache.sis.util.Disposable;
 import org.apache.sis.util.logging.Logging;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
index 75053edbba..a77df53794 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGCodeFinder.java
@@ -43,7 +43,7 @@ import org.opengis.referencing.datum.VerticalDatumType;
 import org.apache.sis.metadata.internal.ReferencingServices;
 import org.apache.sis.metadata.sql.util.SQLUtilities;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.factory.IdentifiedObjectFinder;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index 83a745fc8e..9e68f19b65 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@ -80,13 +80,13 @@ import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.internal.SignReversalComment;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.URLs;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.URLs;
 import org.apache.sis.metadata.iso.citation.DefaultCitation;
 import org.apache.sis.metadata.iso.citation.DefaultOnlineResource;
 import org.apache.sis.metadata.iso.extent.DefaultExtent;
@@ -120,7 +120,7 @@ import org.apache.sis.measure.NumberRange;
 import org.apache.sis.measure.Units;
 
 import static org.apache.sis.util.Utilities.equalsIgnoreMetadata;
-import static org.apache.sis.internal.util.StandardDateFormat.UTC;
+import static org.apache.sis.util.internal.StandardDateFormat.UTC;
 import static org.apache.sis.referencing.internal.ServicesForMetadata.CONNECTION;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGFactory.java
index cc312a9084..e791897f82 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGFactory.java
@@ -41,7 +41,7 @@ import org.apache.sis.metadata.sql.util.Initializer;
 import org.apache.sis.referencing.internal.DeferredCoordinateOperation;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.factory.ConcurrentAuthorityFactory;
 import org.apache.sis.referencing.factory.UnavailableFactoryException;
 import org.apache.sis.util.resources.Messages;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
index 7d8ac8acb8..dbfa01c998 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGInstaller.java
@@ -29,14 +29,14 @@ import java.io.BufferedReader;
 import org.apache.sis.util.StringBuilders;
 import org.apache.sis.metadata.sql.util.ScriptRunner;
 import org.apache.sis.metadata.sql.util.SQLUtilities;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.system.Fallback;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.system.Fallback;
 import org.apache.sis.util.Exceptions;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.logging.PerformanceLevel;
 import org.apache.sis.setup.InstallationResources;
 
-import static org.apache.sis.internal.util.Constants.EPSG;
+import static org.apache.sis.util.internal.Constants.EPSG;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
index b39814742a..eb5ce1522d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/InstallationScriptProvider.java
@@ -36,10 +36,10 @@ import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.setup.InstallationResources;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.Fallback;
-import org.apache.sis.internal.system.DataDirectory;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Fallback;
+import org.apache.sis.system.DataDirectory;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.Constants;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java
index 5892c64007..80a184cc8c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/SQLTranslator.java
@@ -27,7 +27,7 @@ import java.sql.Types;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.sql.util.Reflection;
 import org.apache.sis.metadata.sql.util.SQLUtilities;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/AnnotatedMatrix.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/AnnotatedMatrix.java
index d510992201..03c46ed209 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/AnnotatedMatrix.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/AnnotatedMatrix.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.internal;
 
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.metadata.quality.PositionalAccuracy;
-import org.apache.sis.internal.util.CloneAccess;
+import org.apache.sis.util.internal.CloneAccess;
 import org.apache.sis.referencing.util.PositionalAccuracyConstant;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Arithmetic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Arithmetic.java
index 0dc046c135..7f7160f61a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Arithmetic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/Arithmetic.java
@@ -19,8 +19,8 @@ package org.apache.sis.referencing.internal;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
 import org.opengis.referencing.operation.Matrix;        // For javadoc.
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.math.Fraction;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DatabaseListener.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DatabaseListener.java
index bd26a86882..9cc3efc5d2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DatabaseListener.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/DatabaseListener.java
@@ -22,7 +22,7 @@ import org.opengis.util.FactoryException;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.factory.MultiAuthoritiesFactory;
 import org.apache.sis.metadata.sql.util.Initializer;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.util.logging.Logging;
 
 import static java.util.logging.Logger.getLogger;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGParameterDomain.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGParameterDomain.java
index 72b985e63d..fe84b76170 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGParameterDomain.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/EPSGParameterDomain.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.internal;
 import java.util.Set;
 import javax.measure.Unit;
 import org.apache.sis.measure.NumberRange;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/MergedProperties.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/MergedProperties.java
index d6e91764d6..307ac74992 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/MergedProperties.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/MergedProperties.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.internal;
 
 import java.util.Map;
 import java.util.HashMap;
-import org.apache.sis.internal.util.AbstractMap;
+import org.apache.sis.util.internal.AbstractMap;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
index a935e03ee0..a7bef48f06 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
@@ -64,8 +64,8 @@ import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.metadata.internal.ReferencingServices;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.logging.Logging;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
index 0b49b6b16b..085a6faf9b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
@@ -67,11 +67,11 @@ import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.metadata.internal.ImplementationHelper;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.io.wkt.Convention;
 
 import static org.apache.sis.util.Utilities.deepEquals;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CRSPair.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CRSPair.java
index 2d67f602e8..c72ba883f5 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CRSPair.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CRSPair.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.IdentifiedObjects;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Classes;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java
index f00bbd0ae8..18079130c3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationContext.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.metadata.iso.extent.DefaultExtent;
 import org.apache.sis.metadata.iso.extent.Extents;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
index 8813c3dac3..1005d853ff 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
@@ -49,8 +49,8 @@ import org.apache.sis.referencing.operation.provider.GeographicToGeocentric;
 import org.apache.sis.referencing.operation.provider.GeocentricToGeographic;
 import org.apache.sis.referencing.operation.provider.GeocentricAffine;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.metadata.iso.extent.Extents;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
index 5140fdfcd5..854ee6249c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
@@ -70,7 +70,7 @@ import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.operation.provider.Affine;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.operation.provider.AbstractProvider;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.system.Semaphores;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.Utilities;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
index 9f81e87602..fe8a15d7f7 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
@@ -36,7 +36,7 @@ import org.opengis.referencing.operation.MathTransformFactory;
 import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
 import org.apache.sis.referencing.util.PositionalAccuracyConstant;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
index 6263658949..a9b61824cb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
@@ -39,8 +39,8 @@ import org.apache.sis.referencing.internal.MergedProperties;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.referencing.util.ReferencingUtilities;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.URLs;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.URLs;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.AbstractIdentifiedObject;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
index cbb2fdc5b2..8699e7d430 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
@@ -53,9 +53,9 @@ import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.AbstractMap;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.AbstractMap;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
index fb08510986..ab1a4c2ceb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java
@@ -38,9 +38,9 @@ import org.apache.sis.referencing.datum.DatumShiftGrid;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.geometry.Envelopes;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ResidualGrid.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ResidualGrid.java
index c8b65f6ed3..80afecdf7b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ResidualGrid.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ResidualGrid.java
@@ -30,8 +30,8 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.transform.LinearTransform;
 import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.referencing.util.WKTUtilities;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.math.Statistics;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
index ba96da4ffe..6d04abe121 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/GeneralMatrix.java
@@ -20,8 +20,8 @@ import java.util.Arrays;
 import org.opengis.referencing.operation.Matrix;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.referencing.internal.Arithmetic;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
index d297052299..3f6ad73353 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java
@@ -33,8 +33,8 @@ import org.apache.sis.util.StringBuilders;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.math.MathFunctions;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.internal.Arithmetic;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix1.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix1.java
index 81a8f0b600..fcc969f110 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix1.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix1.java
@@ -17,7 +17,7 @@
 package org.apache.sis.referencing.operation.matrix;
 
 import org.opengis.referencing.operation.Matrix;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix2.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix2.java
index 9616605e9b..8e5e2e67b1 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix2.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrix2.java
@@ -17,7 +17,7 @@
 package org.apache.sis.referencing.operation.matrix;
 
 import org.opengis.referencing.operation.Matrix;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/MatrixSIS.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
index 4ddb27e12e..d2e08c7a4b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/MatrixSIS.java
@@ -22,7 +22,7 @@ import java.awt.geom.AffineTransform;                       // For javadoc
 import org.opengis.referencing.operation.Matrix;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.internal.Arithmetic;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
index e417c251bf..e0c8922164 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/AlbersEqualArea.java
@@ -25,7 +25,7 @@ import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.OperationMethod;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.Workaround;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
index dbcdaeac5b..2a914ae1d0 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/CylindricalEqualArea.java
@@ -27,7 +27,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.opengis.util.FactoryException;
 import org.apache.sis.referencing.operation.provider.Mercator1SP;
 import org.apache.sis.referencing.operation.provider.LambertCylindricalEqualAreaSpherical;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Initializer.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Initializer.java
index 985fd4d64f..3c4db2d2eb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Initializer.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Initializer.java
@@ -22,9 +22,9 @@ import org.opengis.parameter.ParameterNotFoundException;
 import org.opengis.referencing.operation.OperationMethod;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.operation.provider.MapProjection;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.referencing.operation.projection.NormalizedProjection.ParameterRole;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java
index 6efe2a61ca..659c2af017 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertAzimuthalEqualArea.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.OperationMethod;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.transform.ContextualParameters;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.Workaround;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
index 272aa961df..d097614f83 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
@@ -40,7 +40,7 @@ import org.apache.sis.referencing.operation.provider.LambertConformalBelgium;
 import org.apache.sis.referencing.operation.provider.LambertConformalMichigan;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.util.Workaround;
 
 import static java.lang.Math.*;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LongitudeWraparound.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LongitudeWraparound.java
index e28be4ffee..d70225b12d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LongitudeWraparound.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/LongitudeWraparound.java
@@ -30,8 +30,8 @@ import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.referencing.operation.transform.DomainDefinition;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.matrix.Matrices;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.measure.Longitude;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
index fe1314fed5..fb12481a84 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/Mercator.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.operation.provider.MercatorSpherical;
 import org.apache.sis.referencing.operation.provider.MercatorAuxiliarySphere;
 import org.apache.sis.referencing.operation.provider.RegionalMercator;
 import org.apache.sis.referencing.operation.provider.PseudoMercator;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
index e720aee271..35307c0543 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/NormalizedProjection.java
@@ -56,10 +56,10 @@ import org.apache.sis.referencing.operation.transform.DomainDefinition;
 import org.apache.sis.referencing.operation.provider.MapProjection;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.logging.Logging;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
index 6db6ab5919..00c4aba8fb 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/PolarStereographic.java
@@ -36,7 +36,7 @@ import org.apache.sis.referencing.operation.provider.PolarStereographicB;
 import org.apache.sis.referencing.operation.provider.PolarStereographicC;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.measure.Latitude;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
index 5947b44283..bb68d74195 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/TransverseMercator.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.operation.transform.DomainDefinition;
 import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.referencing.operation.provider.TransverseMercatorSouth;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.util.Debug;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
index e5a49614fc..cd226b2c05 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/projection/ZonedGridSystem.java
@@ -38,7 +38,7 @@ import org.apache.sis.parameter.Parameters;
 import org.apache.sis.geometry.Envelope2D;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 import static java.lang.Math.PI;
 import static java.lang.Math.floor;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
index 401e2a1f0b..bb4b71febf 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
@@ -29,7 +29,7 @@ import org.opengis.referencing.IdentifiedObject;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.SingleOperation;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.Units;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
@@ -43,7 +43,7 @@ import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.referencing.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java
index 56bb3b576a..7ae745952b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Affine.java
@@ -25,7 +25,7 @@ import org.opengis.parameter.ParameterNotFoundException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
 import org.apache.sis.parameter.TensorParameters;
@@ -72,7 +72,7 @@ public final class Affine extends AbstractProvider {
      *
      * <p>Note: in contrast, the name used by OGC is just "Affine".</p>
      *
-     * @see org.apache.sis.internal.util.Constants#AFFINE
+     * @see org.apache.sis.util.internal.Constants#AFFINE
      */
     public static final String NAME = "Affine parametric transformation";
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridCompressed.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridCompressed.java
index 14f2d38709..e47e90c036 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridCompressed.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridCompressed.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.operation.provider;
 import java.util.Arrays;
 import javax.measure.Quantity;
 import org.apache.sis.math.DecimalFunctions;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridGroup.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridGroup.java
index 6221e13675..0b0d6c8796 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridGroup.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.util.j2d.IntervalRectangle;
 import org.apache.sis.referencing.util.j2d.TileOrganizer;
 import org.apache.sis.referencing.util.j2d.Tile;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.util.collection.Containers;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridLoader.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridLoader.java
index 1aa7e007ea..6c118a0523 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridLoader.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridLoader.java
@@ -33,7 +33,7 @@ import org.opengis.util.FactoryException;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.DataDirectory;
+import org.apache.sis.system.DataDirectory;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.factory.FactoryDataException;
 import org.apache.sis.referencing.factory.MissingFactoryResourceException;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/EPSGName.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/EPSGName.java
index 11736cd1e5..3f91aa8dfd 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/EPSGName.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/EPSGName.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import org.opengis.metadata.Identifier;
 import org.opengis.util.GenericName;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.ImmutableIdentifier;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.NamedIdentifier;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java
index 6acaa8c761..aad3d0b2f9 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Equirectangular.java
@@ -35,8 +35,8 @@ import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.referencing.util.j2d.ParameterizedAffine;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.Constants;
 
 import static java.lang.Math.*;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
index 2f112e15b2..ef897b531a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/FranceGeocentricInterpolation.java
@@ -57,7 +57,7 @@ import org.apache.sis.referencing.datum.DefaultEllipsoid;
 import org.apache.sis.referencing.operation.transform.InterpolatedGeocentricTransform;
 
 import static java.lang.Float.parseFloat;
-import static org.apache.sis.internal.util.Constants.DIM;
+import static org.apache.sis.util.internal.Constants.DIM;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricAffineBetweenGeographic.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricAffineBetweenGeographic.java
index 6370dd3d8b..521844810f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricAffineBetweenGeographic.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricAffineBetweenGeographic.java
@@ -28,7 +28,7 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.apache.sis.referencing.operation.transform.EllipsoidToCentricTransform;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.measure.Units;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java
index e28b7c69bc..1ff1a20989 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeocentricToTopocentric.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix4;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.measure.Units;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 
 import static java.lang.Math.cos;
 import static java.lang.Math.sin;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
index 7a885cde4e..cdeaa3600a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.operation.MathTransformFactory;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicRedimension.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicRedimension.java
index d11151672d..9774fcde90 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicRedimension.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicRedimension.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java
index ee6b078b1c..ec7c9f6082 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/GeographicToGeocentric.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactor
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java
index 90fd3ef094..ae116313c4 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Interpolation1D.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.parameter.ParameterBuilder;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java
index 1a5e13fbaf..1fa6c34133 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/LambertConformal2SP.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.operation.provider;
 import jakarta.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.metadata.iso.citation.Citations;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java
index b4a5091344..89fb9bd4e8 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MapProjection.java
@@ -37,7 +37,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.referencing.operation.Projection;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.measure.Units;
 import org.apache.sis.referencing.NamedIdentifier;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java
index 10ae2005b4..7dddd2fc66 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Mercator1SP.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.operation.provider;
 import jakarta.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.metadata.iso.citation.Citations;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java
index 017662de46..8741a7920b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MillerCylindrical.java
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.operation.provider;
 
 import jakarta.xml.bind.annotation.XmlTransient;
 import org.opengis.parameter.ParameterDescriptorGroup;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java
index 672e9263b7..ec51051500 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Molodensky.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.datum.DefaultEllipsoid;
 import org.apache.sis.referencing.operation.transform.MolodenskyTransform;
 import org.apache.sis.referencing.util.NilReferencingObject;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Debug;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MolodenskyInterpolation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MolodenskyInterpolation.java
index 231c5dd597..aae531454d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MolodenskyInterpolation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/MolodenskyInterpolation.java
@@ -26,7 +26,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.ParameterValueGroup;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.operation.transform.InterpolatedMolodenskyTransform;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
index 75c87abedf..59153e4622 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/NTv2.java
@@ -45,7 +45,7 @@ import org.opengis.referencing.operation.Transformation;
 import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.collection.Containers;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java
index aae904e29b..4f34f4d176 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/PolarStereographicA.java
@@ -24,8 +24,8 @@ import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Units;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java
index 6119f39612..cfa6df6ca4 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/SatelliteTracking.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.projection.NormalizedProjection;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.Units;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java
index 072a490154..305234f9cc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Sinusoidal.java
@@ -22,7 +22,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.ParameterNotFoundException;
 import org.opengis.referencing.operation.Projection;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java
index ea2838510e..f152150b03 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/TransverseMercator.java
@@ -26,8 +26,8 @@ import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.operation.projection.NormalizedProjection;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.MathFunctions;
 import org.apache.sis.measure.Units;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
index 9c23b2c437..d48df3e25c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
@@ -28,7 +28,7 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.provider.Affine;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
 import org.opengis.util.FactoryException;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
index 2447bdc225..4fa72199f3 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
@@ -40,7 +40,7 @@ import org.apache.sis.io.wkt.FormattableObject;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Utilities;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CartesianToPolar.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CartesianToPolar.java
index 1c77ffd9cb..ff6b5dc55e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CartesianToPolar.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CartesianToPolar.java
@@ -22,7 +22,7 @@ import java.io.ObjectStreamException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 
 import static java.lang.Math.*;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
index e19e9771b2..163e2f1c63 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
@@ -38,8 +38,8 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.provider.GeocentricAffine;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.Semaphores;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Semaphores;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.Utilities;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameter.java
index 379922bac6..ce1d6b2544 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameter.java
@@ -33,7 +33,7 @@ import org.apache.sis.parameter.DefaultParameterValue;
  * instances of the {@link org.apache.sis.parameter} package that do the checks.
  *
  * <p>Skipping redundant verifications allows us to avoid redundant logging messages when
- * the {@link org.apache.sis.internal.system.Semaphores#SUSPEND_PARAMETER_CHECK} flag is set.
+ * the {@link org.apache.sis.system.Semaphores#SUSPEND_PARAMETER_CHECK} flag is set.
  * Furthermore, it is a little bit late for checking parameter validity here; that verification should have been done
  * at {@link AbstractMathTransform} construction time or even before, and the job of the {@link ContextualParameters}
  * class is just to record what have been used.</p></div>
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java
index d2512db72d..a4ac5e17d9 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ContextualParameters.java
@@ -40,8 +40,8 @@ import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.WKTKeywords;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.parameter.Parameterized;
 import org.apache.sis.parameter.DefaultParameterValue;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
index 19d961f8af..4de23d44ad 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
@@ -32,7 +32,7 @@ import org.opengis.referencing.operation.OperationMethod;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.WKTUtilities;
 import org.apache.sis.referencing.util.CoordinateOperations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
 import org.apache.sis.referencing.cs.AxesConvention;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
index 103c05c6ef..f55b3c6a6a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
@@ -54,9 +54,9 @@ import org.opengis.util.FactoryException;
 import org.opengis.util.NoSuchIdentifierException;
 
 import org.apache.sis.io.wkt.Parser;
-import org.apache.sis.internal.util.URLs;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.URLs;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.util.CoordinateOperations;
 import org.apache.sis.referencing.util.ReferencingUtilities;
@@ -66,7 +66,7 @@ import org.apache.sis.referencing.operation.provider.VerticalOffset;
 import org.apache.sis.referencing.operation.provider.GeographicToGeocentric;
 import org.apache.sis.referencing.operation.provider.GeocentricToGeographic;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.system.Reflect;
+import org.apache.sis.system.Reflect;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.DefaultParameterValueGroup;
 import org.apache.sis.parameter.Parameterized;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
index 6a04a3e5cd..e3ed8556e8 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
@@ -38,9 +38,9 @@ import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.util.Debug;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.DirectPositionView;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
index 087933e6df..738bff7b98 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransform1D;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.util.FactoryException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ComparisonMode;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
index 6ffd58f56a..2b93a792c6 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java
@@ -30,7 +30,7 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.operation.provider.FranceGeocentricInterpolation;
 import org.apache.sis.referencing.operation.provider.Molodensky;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.referencing.datum.DatumShiftGrid;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
index 7f0ec58124..5c2010b71a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java
@@ -30,7 +30,7 @@ import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.operation.provider.FranceGeocentricInterpolation;
 import org.apache.sis.referencing.operation.provider.Molodensky;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.parameter.ParameterBuilder;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
index 8997467c0e..a5bca4bc7c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
@@ -27,7 +27,7 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.apache.sis.referencing.operation.matrix.Matrix1;
 import org.apache.sis.referencing.operation.provider.Interpolation1D;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
index a17c1af05e..a86e6ef077 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
@@ -30,7 +30,7 @@ import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.operation.provider.Affine;
 import org.apache.sis.referencing.internal.Arithmetic;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.util.ComparisonMode;
 /*
  * We really want to use doubleToRawLongBits, not doubleToLongBits, because the
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java
index 61f4c8c270..53406bc38e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransform1D;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.util.FactoryException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.MathFunctions;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java
index 7abc07a5bf..cfa74ef81c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java
@@ -37,7 +37,7 @@ import org.apache.sis.referencing.util.j2d.AffineTransform2D;
 import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.matrix.Matrices;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.util.OptionalCandidate;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
index 4ef330a464..84295e5bc2 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.datum.DefaultEllipsoid;
 import org.apache.sis.referencing.datum.DatumShiftGrid;
 import org.apache.sis.referencing.operation.provider.Molodensky;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OperationMethodSet.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OperationMethodSet.java
index f9c5b98c75..02a7b5c5dc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OperationMethodSet.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OperationMethodSet.java
@@ -24,7 +24,7 @@ import java.util.NoSuchElementException;
 import java.util.ServiceLoader;
 import org.opengis.referencing.operation.SingleOperation;
 import org.opengis.referencing.operation.OperationMethod;
-import org.apache.sis.internal.util.SetOfUnknownSize;
+import org.apache.sis.util.internal.SetOfUnknownSize;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
index 64dab7291d..69d62b0479 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.util.MathTransformsOrFactory;
 import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.referencing.util.WKTKeywords;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.geometry.GeneralDirectPosition;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PolarToCartesian.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PolarToCartesian.java
index d1fe42bb68..780f50b6cc 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PolarToCartesian.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PolarToCartesian.java
@@ -22,7 +22,7 @@ import java.io.ObjectStreamException;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.operation.MathTransform;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 
 import static java.lang.Math.*;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PoleRotation.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PoleRotation.java
index af6b2dbb83..461fcf486b 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PoleRotation.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PoleRotation.java
@@ -33,8 +33,8 @@ import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.provider.NorthPoleRotation;
 import org.apache.sis.referencing.operation.provider.SouthPoleRotation;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.ImmutableIdentifier;
 import org.apache.sis.referencing.operation.matrix.Matrix2;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PowerTransform1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
index 9418641b18..8316091908 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PowerTransform1D.java
@@ -21,7 +21,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransform1D;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.util.FactoryException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ComparisonMode;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
index df034b26ed..01faa63400 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java
@@ -25,7 +25,7 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.internal.Arithmetic;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.math.Fraction;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformSeparator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformSeparator.java
index 8ae0cdad9f..32cad11f17 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformSeparator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/TransformSeparator.java
@@ -25,7 +25,7 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.util.MathTransformsOrFactory;
 import org.apache.sis.referencing.internal.Resources;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/WraparoundTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/WraparoundTransform.java
index 302289a93b..897a07229d 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/WraparoundTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/WraparoundTransform.java
@@ -32,7 +32,7 @@ import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.util.MathTransformsOrFactory;
 import org.apache.sis.referencing.operation.provider.Wraparound;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxesMapper.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxesMapper.java
index 81cf43f9f3..b063334865 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxesMapper.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/AxesMapper.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.util;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.apache.sis.referencing.cs.CoordinateSystems;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 import static java.lang.Long.numberOfTrailingZeros;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java
index ecd6f46697..eeba71b6c1 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/CoordinateOperations.java
@@ -39,8 +39,8 @@ import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
 import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
 import org.apache.sis.referencing.factory.GeodeticObjectFactory;
 import org.apache.sis.metadata.internal.NameToIdentifier;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.Deprecable;
 import org.apache.sis.util.Static;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java
index 85bf28524e..7eda517120 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/Formulas.java
@@ -19,8 +19,8 @@ package org.apache.sis.referencing.util;
 import org.opengis.referencing.datum.Ellipsoid;
 import org.apache.sis.util.Static;
 import org.apache.sis.measure.Latitude;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.referencing.datum.DefaultEllipsoid;
 
 import static java.lang.Math.*;
@@ -50,7 +50,7 @@ public final class Formulas extends Static {
      * to keep the same precision there even if {@code LINEAR_TOLERANCE} was made smaller.
      *
      * @see #ANGULAR_TOLERANCE
-     * @see org.apache.sis.internal.util.Numerics#COMPARISON_THRESHOLD
+     * @see org.apache.sis.util.internal.Numerics#COMPARISON_THRESHOLD
      */
     @Configuration
     public static final double LINEAR_TOLERANCE = 0.01;
@@ -63,7 +63,7 @@ public final class Formulas extends Static {
      * <p>For a {@link #LINEAR_TOLERANCE} of 1 centimetre, this is slightly less than 1E-7°.</p>
      *
      * @see #LINEAR_TOLERANCE
-     * @see org.apache.sis.internal.util.Numerics#COMPARISON_THRESHOLD
+     * @see org.apache.sis.util.internal.Numerics#COMPARISON_THRESHOLD
      */
     @Configuration
     public static final double ANGULAR_TOLERANCE = LINEAR_TOLERANCE / (NAUTICAL_MILE * 60);
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/LazySet.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/LazySet.java
index 36189a1e01..88c9cdcc57 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/LazySet.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/LazySet.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.util;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import org.apache.sis.internal.util.SetOfUnknownSize;
+import org.apache.sis.util.internal.SetOfUnknownSize;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/PositionalAccuracyConstant.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/PositionalAccuracyConstant.java
index 768ef3e586..a07ffb1dc6 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/PositionalAccuracyConstant.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/PositionalAccuracyConstant.java
@@ -36,7 +36,7 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.metadata.iso.quality.DefaultConformanceResult;
 import org.apache.sis.metadata.iso.quality.DefaultAbsoluteExternalPositionalAccuracy;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.util.resources.Vocabulary;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingFactoryContainer.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingFactoryContainer.java
index 42da4d32ad..57e9971200 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingFactoryContainer.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/ReferencingFactoryContainer.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactor
 import org.apache.sis.referencing.factory.NoSuchAuthorityFactoryException;
 import org.apache.sis.referencing.factory.GeodeticObjectFactory;
 import org.apache.sis.referencing.CRS;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.iso.DefaultNameFactory;
 import org.apache.sis.util.resources.Errors;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WKTUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WKTUtilities.java
index 6e4e083ad6..0e44e1376e 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WKTUtilities.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WKTUtilities.java
@@ -47,7 +47,7 @@ import org.apache.sis.referencing.datum.DefaultPrimeMeridian;
 import org.apache.sis.referencing.datum.DefaultEllipsoid;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.referencing.operation.provider.Affine;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.parameter.DefaultParameterValue;
 import org.apache.sis.parameter.Parameterized;
 import org.apache.sis.io.wkt.ElementKind;
@@ -57,8 +57,8 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.math.Statistics;
 import org.apache.sis.math.Vector;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WraparoundApplicator.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WraparoundApplicator.java
index b787461929..421e7fd89a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WraparoundApplicator.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/WraparoundApplicator.java
@@ -29,7 +29,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.referencing.operation.transform.WraparoundTransform;
 import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.measure.Units;
 
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/AffineMatrix.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/AffineMatrix.java
index d31317db6f..663833ed76 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/AffineMatrix.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/AffineMatrix.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.io.Serializable;
 import java.awt.geom.AffineTransform;
 import org.opengis.referencing.operation.Matrix;
-import org.apache.sis.internal.util.CloneAccess;
+import org.apache.sis.util.internal.CloneAccess;
 import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.operation.matrix.Matrices;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/IntervalRectangle.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/IntervalRectangle.java
index 85ec487ef7..a772504f49 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/IntervalRectangle.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/IntervalRectangle.java
@@ -21,7 +21,7 @@ import java.awt.geom.Rectangle2D;
 import org.opengis.geometry.Envelope;
 import org.opengis.geometry.DirectPosition;
 import org.apache.sis.geometry.Envelope2D;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/ParameterizedAffine.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/ParameterizedAffine.java
index 8cc2d89e6a..42db4f7523 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/ParameterizedAffine.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/util/j2d/ParameterizedAffine.java
@@ -21,7 +21,7 @@ import java.awt.geom.AffineTransform;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.referencing.operation.MathTransform;
-import org.apache.sis.internal.system.Semaphores;
+import org.apache.sis.system.Semaphores;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java
index 1cff30d177..76df20036a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameter.java
@@ -40,7 +40,7 @@ import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.GeodeticException;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.CorruptedObjectException;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.xml.bind.gco.PropertyType;
 import org.apache.sis.xml.bind.Context;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AxisDirection.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AxisDirection.java
index 344087078a..37a623e00f 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AxisDirection.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_AxisDirection.java
@@ -19,7 +19,7 @@ package org.apache.sis.xml.bind.referencing;
 import org.opengis.referencing.cs.AxisDirection;
 import org.apache.sis.xml.bind.gml.CodeListAdapter;
 
-import static org.apache.sis.internal.util.Constants.EPSG;
+import static org.apache.sis.util.internal.Constants.EPSG;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_RangeMeaning.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_RangeMeaning.java
index 6e9d7d4a95..d0190a6cbe 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_RangeMeaning.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/CS_RangeMeaning.java
@@ -19,7 +19,7 @@ package org.apache.sis.xml.bind.referencing;
 import org.opengis.referencing.cs.RangeMeaning;
 import org.apache.sis.xml.bind.gml.CodeListAdapter;
 
-import static org.apache.sis.internal.util.Constants.EPSG;
+import static org.apache.sis.util.internal.Constants.EPSG;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
index 8632140945..2cde66a2b6 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
@@ -21,8 +21,8 @@ import jakarta.xml.bind.annotation.XmlValue;
 import jakarta.xml.bind.annotation.XmlAttribute;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.DefinitionURI;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.DefinitionURI;
 import org.apache.sis.metadata.internal.NameMeaning;
 import org.apache.sis.referencing.NamedIdentifier;
 import org.apache.sis.metadata.internal.Identifiers;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/FormatterTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/FormatterTest.java
index dcfc230138..94876b2460 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/FormatterTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/FormatterTest.java
@@ -21,7 +21,7 @@ import org.opengis.metadata.extent.GeographicBoundingBox;
 import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.metadata.iso.extent.DefaultVerticalExtent;
 import org.apache.sis.measure.Units;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 
 // Test imports
 import org.apache.sis.test.mock.VerticalCRSMock;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
index 32d7388964..9606404370 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java
@@ -54,7 +54,7 @@ import static org.apache.sis.test.Assertions.assertMultilinesEquals;
 import static org.apache.sis.referencing.Assertions.assertAxisEquals;
 import static org.apache.sis.referencing.Assertions.assertDiagonalEquals;
 import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
index 2d5307b122..ac72a6e4e1 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import org.opengis.parameter.ParameterDirection;
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.opengis.parameter.ParameterNotFoundException;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.DependsOnMethod;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
index b1b48eb8f4..e4eaf81424 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterDescriptorTest.java
@@ -26,7 +26,7 @@ import org.apache.sis.measure.NumberRange;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.referencing.ImmutableIdentifier;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.measure.Units;
 import org.apache.sis.test.DependsOnMethod;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterValueTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterValueTest.java
index 069ca6b46d..534c264322 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterValueTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/DefaultParameterValueTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.datum.VerticalDatumType;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.parameter.InvalidParameterTypeException;
 import org.opengis.parameter.InvalidParameterValueException;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.measure.Units;
 import org.apache.sis.test.DependsOnMethod;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MapProjectionParametersTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MapProjectionParametersTest.java
index 243ed4354b..0b2faed152 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MapProjectionParametersTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/MapProjectionParametersTest.java
@@ -25,15 +25,15 @@ import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
-import static org.apache.sis.internal.util.Constants.SEMI_MAJOR;
-import static org.apache.sis.internal.util.Constants.SEMI_MINOR;
-import static org.apache.sis.internal.util.Constants.EARTH_RADIUS;
-import static org.apache.sis.internal.util.Constants.INVERSE_FLATTENING;
-import static org.apache.sis.internal.util.Constants.IS_IVF_DEFINITIVE;
-import static org.apache.sis.internal.util.Constants.CENTRAL_MERIDIAN;
-import static org.apache.sis.internal.util.Constants.STANDARD_PARALLEL;
-import static org.apache.sis.internal.util.Constants.STANDARD_PARALLEL_1;
-import static org.apache.sis.internal.util.Constants.STANDARD_PARALLEL_2;
+import static org.apache.sis.util.internal.Constants.SEMI_MAJOR;
+import static org.apache.sis.util.internal.Constants.SEMI_MINOR;
+import static org.apache.sis.util.internal.Constants.EARTH_RADIUS;
+import static org.apache.sis.util.internal.Constants.INVERSE_FLATTENING;
+import static org.apache.sis.util.internal.Constants.IS_IVF_DEFINITIVE;
+import static org.apache.sis.util.internal.Constants.CENTRAL_MERIDIAN;
+import static org.apache.sis.util.internal.Constants.STANDARD_PARALLEL;
+import static org.apache.sis.util.internal.Constants.STANDARD_PARALLEL_1;
+import static org.apache.sis.util.internal.Constants.STANDARD_PARALLEL_2;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorParametersTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorParametersTest.java
index 992b16ebf7..63e14ab916 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorParametersTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorParametersTest.java
@@ -34,8 +34,8 @@ import static org.opengis.test.Validators.validate;
 import static org.apache.sis.test.Assertions.assertSerializedEquals;
 import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
 import static org.apache.sis.referencing.Assertions.assertAliasTipEquals;
-import static org.apache.sis.internal.util.Constants.NUM_ROW;
-import static org.apache.sis.internal.util.Constants.NUM_COL;
+import static org.apache.sis.util.internal.Constants.NUM_ROW;
+import static org.apache.sis.util.internal.Constants.NUM_COL;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorValuesTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorValuesTest.java
index ca0095a3c3..b8de0e8d93 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorValuesTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/TensorValuesTest.java
@@ -28,7 +28,7 @@ import org.opengis.parameter.ParameterNotFoundException;
 import org.opengis.referencing.operation.Matrix;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.provider.Affine;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
@@ -38,8 +38,8 @@ import static org.junit.Assert.*;
 import static org.opengis.test.Validators.validate;
 import static org.apache.sis.test.Assertions.assertSerializedEquals;
 import static org.apache.sis.referencing.Assertions.assertWktEquals;
-import static org.apache.sis.internal.util.Constants.NUM_ROW;
-import static org.apache.sis.internal.util.Constants.NUM_COL;
+import static org.apache.sis.util.internal.Constants.NUM_ROW;
+import static org.apache.sis.util.internal.Constants.NUM_COL;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
index e74dc9fd59..a315033739 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/Assertions.java
@@ -44,7 +44,7 @@ import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralDirectPosition;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.operation.transform.LinearTransform;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.test.TestUtilities;
 
 import static java.lang.StrictMath.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java
index 5d67f0b4ff..c4a5167a64 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/AuthorityFactoriesTest.java
@@ -25,8 +25,8 @@ import org.opengis.referencing.crs.CRSAuthorityFactory;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.crs.GeographicCRS;
 import org.apache.sis.util.ComparisonMode;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.internal.EPSGFactoryProxy;
 import org.apache.sis.referencing.crs.HardCodedCRS;
 import org.apache.sis.referencing.factory.CommonAuthorityFactory;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
index d9212112ba..5ea5a09445 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CRSTest.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.crs.DefaultGeographicCRS;
 import org.apache.sis.referencing.crs.DefaultProjectedCRS;
 import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.metadata.iso.extent.DefaultExtent;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.Utilities;
 
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
index 50a8d68894..5f2780fde2 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java
@@ -37,7 +37,7 @@ import org.opengis.referencing.datum.VerticalDatumType;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.metadata.internal.AxisNames;
 import org.apache.sis.referencing.internal.VerticalDatumTypes;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 
 // Test dependencies
 import org.opengis.test.Validators;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
index ba59618466..c60ac99f46 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/ImmutableIdentifierTest.java
@@ -25,7 +25,7 @@ import org.apache.sis.metadata.iso.citation.DefaultCitation;
 import org.apache.sis.util.SimpleInternationalString;
 import org.apache.sis.metadata.simple.SimpleCitation;
 import org.apache.sis.xml.util.LegacyNamespaces;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.xml.TestCase;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java
index fbc641e147..f156351d53 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/StandardDefinitionsTest.java
@@ -30,7 +30,7 @@ import org.opengis.referencing.datum.PrimeMeridian;
 import org.opengis.referencing.datum.GeodeticDatum;
 import org.opengis.referencing.datum.VerticalDatum;
 import org.apache.sis.metadata.iso.citation.Citations;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.Units;
 
 // Test dependencies
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
index ff557b4f92..83e53cd316 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
@@ -29,8 +29,8 @@ import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.cs.HardCodedCS;
 import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
 import org.apache.sis.referencing.util.GeodeticObjectBuilder;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
index cf32930335..236779bfdd 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultTemporalCRSTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static org.apache.sis.referencing.Assertions.assertWktEquals;
-import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
-import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_MILLISECOND;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.StandardDateFormat.NANOS_PER_MILLISECOND;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
index e6dfced43e..2401c94743 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.*;
 import static org.opengis.test.Assert.assertIdentifierEquals;
 import static org.apache.sis.referencing.Assertions.assertWktEquals;
 import static org.apache.sis.test.TestUtilities.getSingleton;
-import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
index d9b3a3a681..bf77dc6e8a 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/datum/HardCodedDatum.java
@@ -27,7 +27,7 @@ import org.apache.sis.metadata.iso.citation.HardCodedCitations;
 import org.apache.sis.measure.Units;
 
 import static org.opengis.referencing.datum.Datum.*;
-import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
index 41fa207023..694e80b8d2 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/CommonAuthorityFactoryTest.java
@@ -33,7 +33,7 @@ import org.opengis.referencing.crs.VerticalCRS;
 import org.opengis.referencing.crs.TemporalCRS;
 import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.datum.Datum;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.operation.provider.TransverseMercator;
 import org.apache.sis.referencing.operation.transform.LinearTransform;
 import org.apache.sis.referencing.IdentifiedObjects;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
index 609be043fc..ccdbd03e4f 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/MultiAuthoritiesFactoryTest.java
@@ -34,7 +34,7 @@ import org.opengis.referencing.datum.GeodeticDatum;
 import org.opengis.referencing.datum.PrimeMeridian;
 import org.opengis.referencing.datum.VerticalDatum;
 import org.opengis.util.FactoryException;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.metadata.iso.extent.Extents;
 import org.apache.sis.referencing.cs.HardCodedCS;
 import org.apache.sis.referencing.crs.HardCodedCRS;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
index 2e0a3f3e1b..24a9ad2cd1 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/TestFactorySource.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import org.postgresql.ds.PGSimpleDataSource;
 import org.opengis.util.FactoryException;
 import org.opengis.referencing.crs.CRSAuthorityFactory;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.sql.util.Initializer;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.factory.sql.EPSGFactory;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
index 97055afd12..934527f001 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGFactoryTest.java
@@ -46,7 +46,7 @@ import org.opengis.referencing.operation.OperationMethod;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.Projection;
 import org.opengis.util.FactoryException;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.cs.AxesConvention;
 import org.apache.sis.referencing.crs.DefaultGeographicCRS;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
index 8cb51c6186..b7a807ef20 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/EPSGInstallerTest.java
@@ -31,8 +31,8 @@ import org.opengis.util.FactoryException;
 import org.opengis.referencing.crs.GeographicCRS;
 import org.opengis.referencing.crs.ProjectedCRS;
 import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.sql.util.Reflection;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.Utilities;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
index b62929e490..04617a1b68 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/factory/sql/epsg/DataScriptFormatter.java
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.util.CharSequences;
-import org.apache.sis.internal.util.URLs;
+import org.apache.sis.util.internal.URLs;
 import org.apache.sis.metadata.sql.util.ScriptRunner;
 import org.apache.sis.test.sql.TestDatabase;
 
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
index 2ac2e53a99..2ab8458a98 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactoryTest.java
@@ -29,7 +29,7 @@ import org.opengis.referencing.operation.SingleOperation;
 import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.util.PositionalAccuracyConstant;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.geometry.DirectPosition2D;
 import org.apache.sis.io.wkt.WKTFormat;
 import org.apache.sis.referencing.CRS;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
index f93ddd98c1..d51f6c1d29 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/GeneralMatrixTest.java
@@ -17,7 +17,7 @@
 package org.apache.sis.referencing.operation.matrix;
 
 import java.util.Random;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatricesTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatricesTest.java
index b88721f96c..53043ea891 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatricesTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatricesTest.java
@@ -20,7 +20,7 @@ import org.opengis.geometry.Envelope;
 import org.opengis.geometry.DirectPosition;
 import org.opengis.referencing.operation.Matrix;
 import org.opengis.referencing.cs.AxisDirection;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.geometry.Envelope2D;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.geometry.DirectPosition2D;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
index 9fc7c0cdd6..2936df6e9a 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/matrix/MatrixTestCase.java
@@ -20,7 +20,7 @@ import java.util.Random;
 import java.awt.geom.AffineTransform;
 import Jama.Matrix;
 import org.apache.sis.math.Statistics;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.test.TestCase;
 import org.apache.sis.test.TestUtilities;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java
index f0d9dab699..2419197881 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/AuthalicConversionTest.java
@@ -20,7 +20,7 @@ import java.util.Random;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.referencing.operation.provider.LambertCylindricalEqualArea;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.test.TestUtilities;
 import org.apache.sis.test.DependsOn;
 import org.junit.Test;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/Benchmark.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/Benchmark.java
index 0911ecc353..7ea90fb806 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/Benchmark.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/Benchmark.java
@@ -27,8 +27,8 @@ import org.apache.sis.math.Statistics;
 import org.apache.sis.math.StatisticsFormat;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.referencing.operation.provider.AbstractProvider;
 import org.apache.sis.referencing.operation.transform.LinearTransform;
 import org.apache.sis.referencing.operation.transform.MathTransforms;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
index 028acb59b4..07f800ad01 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.operation.projection;
 import java.util.Random;
 import org.opengis.referencing.operation.TransformException;
 import org.opengis.test.referencing.TransformTestCase;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.referencing.operation.transform.AbstractMathTransform1D;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
index ab9e40c1b4..4da38a47d3 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MapProjectionTestCase.java
@@ -23,7 +23,7 @@ import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.TransformException;
 import org.opengis.test.referencing.ParameterizedTransformTest;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.operation.provider.MapProjection;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
 import org.apache.sis.referencing.operation.transform.CoordinateDomain;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
index 7f03f91544..6bc00a9190 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
@@ -27,7 +27,7 @@ import org.apache.sis.referencing.internal.Resources;
 import org.apache.sis.metadata.internal.ReferencingServices;
 
 import static java.lang.Math.*;     // Not StrictMath in this particular case.
-import static org.apache.sis.internal.util.StandardDateFormat.NANOS_PER_SECOND;
+import static org.apache.sis.util.internal.StandardDateFormat.NANOS_PER_SECOND;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
index 2a87a62034..cf182dc184 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/MercatorTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.referencing.operation.projection;
 import org.opengis.util.FactoryException;
 import org.opengis.referencing.operation.TransformException;
 import org.opengis.referencing.operation.NoninvertibleTransformException;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.util.Formulas;
 import org.apache.sis.referencing.operation.provider.Mercator1SP;
 import org.apache.sis.referencing.operation.provider.Mercator2SP;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java
index 2792a9338f..d4ff36fe0c 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/NoOp.java
@@ -24,7 +24,7 @@ import org.apache.sis.referencing.datum.GeodeticDatumMock;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.Workaround;
 
 
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
index 3bd4e4f5c7..e710532669 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/projection/ZonedGridSystemTest.java
@@ -22,7 +22,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.operation.transform.MathTransformFactoryMock;
 import org.apache.sis.referencing.operation.provider.ZonedTransverseMercator;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.parameter.Parameterized;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
index 24a3ef28a1..165aac5a89 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/MapProjectionTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.apache.sis.referencing.Assertions.assertOgcIdentifierEquals;
 import static org.apache.sis.referencing.Assertions.assertEpsgIdentifierEquals;
-import static org.apache.sis.internal.util.Constants.*;
+import static org.apache.sis.util.internal.Constants.*;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
index 8324f57d9c..f2bc41b428 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
@@ -33,7 +33,7 @@ import org.apache.sis.geometry.Envelope2D;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.measure.Units;
 import org.apache.sis.referencing.util.Formulas;
-import org.apache.sis.internal.system.DataDirectory;
+import org.apache.sis.system.DataDirectory;
 import org.apache.sis.test.DependsOn;
 import org.junit.Test;
 
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/TransverseMercatorTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/TransverseMercatorTest.java
index 974bb58379..cb646524c8 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/TransverseMercatorTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/TransverseMercatorTest.java
@@ -17,7 +17,7 @@
 package org.apache.sis.referencing.operation.provider;
 
 import org.opengis.parameter.ParameterValueGroup;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
index e4a0f63110..f4a7674e58 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactoryTest.java
@@ -37,7 +37,7 @@ import org.apache.sis.referencing.crs.DefaultProjectedCRS;
 import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
 import org.apache.sis.referencing.operation.provider.Affine;
 import org.apache.sis.referencing.operation.provider.Mercator1SP;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.measure.Units;
 
 // Test dependencies
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
index 7f2eb22206..ac95c2547e 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/OperationMethodSetTest.java
@@ -28,7 +28,7 @@ import org.opengis.referencing.operation.CylindricalProjection;
 import org.opengis.referencing.operation.OperationMethod;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
 import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
index 1f24c53d4e..ef74505072 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.operation.matrix.Matrix2;
 import org.apache.sis.referencing.operation.matrix.Matrix4;
 import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.operation.provider.Affine;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.parameter.Parameterized;
 import org.apache.sis.math.Fraction;
 
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
index 32637c04ae..f9a30926c0 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/ScaleTransformTest.java
@@ -20,7 +20,7 @@ import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.matrix.Matrix4;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
index c21336f6c4..42170dfb87 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TranslationTransformTest.java
@@ -21,7 +21,7 @@ import org.apache.sis.referencing.util.ExtendedPrecisionMatrix;
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.matrix.Matrix4;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateOperationMethods.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateOperationMethods.java
index c0d68c3b97..8e37efa47a 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateOperationMethods.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateOperationMethods.java
@@ -32,12 +32,12 @@ import org.opengis.referencing.operation.*;
 import org.opengis.referencing.crs.CRSAuthorityFactory;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.crs.GeneralDerivedCRS;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.operation.provider.Affine;
 import org.apache.sis.referencing.operation.provider.AlbersEqualArea;
 import org.apache.sis.referencing.operation.provider.LambertConformal2SP;
 import org.apache.sis.referencing.operation.provider.ObliqueMercator;
-import org.apache.sis.internal.util.URLs;
+import org.apache.sis.util.internal.URLs;
 import org.apache.sis.measure.Range;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
index 25c6f0abaa..02e06505da 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
@@ -46,7 +46,7 @@ import org.opengis.referencing.operation.OperationMethod;
 import org.opengis.test.report.AuthorityCodesReport;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.referencing.internal.DeprecatedCode;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.IdentifiedObjects;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/HTMLGenerator.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/HTMLGenerator.java
index cdbe82e9e5..6fd8a3ebbe 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/HTMLGenerator.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/report/HTMLGenerator.java
@@ -26,7 +26,7 @@ import java.io.BufferedWriter;
 import java.io.OutputStreamWriter;
 import java.io.Closeable;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Deprecable;
 
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java
index 829dce8a3f..852931f22e 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/ConsistencyTest.java
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.factory.FactoryDataException;
 import org.apache.sis.referencing.factory.UnavailableFactoryException;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.CRS;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.io.wkt.Warnings;
 import org.apache.sis.io.wkt.WKTFormat;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/DatumShiftTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/DatumShiftTest.java
index 3ac745444f..80090387d8 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/DatumShiftTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/DatumShiftTest.java
@@ -20,7 +20,7 @@ import java.net.URI;
 import org.apache.sis.referencing.operation.provider.NTv2Test;
 import org.apache.sis.referencing.operation.provider.NADCONTest;
 import org.apache.sis.referencing.operation.provider.FranceGeocentricInterpolationTest;
-import org.apache.sis.internal.system.DataDirectory;
+import org.apache.sis.system.DataDirectory;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
index a8d544877e..5c53db699a 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataTest.java
@@ -56,8 +56,8 @@ import org.apache.sis.referencing.crs.DefaultVerticalCRS;
 import org.apache.sis.xml.bind.metadata.replace.ReferenceSystemMetadata;
 import org.apache.sis.xml.util.LegacyNamespaces;
 import org.apache.sis.xml.bind.gcx.Anchor;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.SimpleInternationalString;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.xml.Namespaces;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
index d50a82de6c..bd0ceee158 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java
@@ -39,7 +39,7 @@ import org.opengis.referencing.crs.VerticalCRS;
 import org.opengis.referencing.datum.VerticalDatum;
 import org.opengis.referencing.datum.VerticalDatumType;
 
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.xml.NilObject;
 import org.apache.sis.xml.NilReason;
 
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java
index 912a614260..25a6cdfd75 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_GeneralOperationParameterTest.java
@@ -25,7 +25,7 @@ import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.apache.sis.parameter.DefaultParameterDescriptor;
 import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.xml.Namespaces;
 import org.apache.sis.test.xml.TestCase;
 import org.apache.sis.test.DependsOn;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java
index 5b8d7c4e23..e41103a52f 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CC_OperationParameterGroupTest.java
@@ -28,7 +28,7 @@ import org.apache.sis.parameter.DefaultParameterDescriptor;
 import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.referencing.operation.provider.Mercator1SP;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.measure.Units;
 import org.apache.sis.test.xml.TestCase;
 import org.apache.sis.test.DependsOn;
diff --git a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
index e8867ea5c9..f03e0867d3 100644
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/xml/bind/referencing/CodeTest.java
@@ -19,7 +19,7 @@ package org.apache.sis.xml.bind.referencing;
 import java.util.Set;
 import org.opengis.referencing.crs.GeographicCRS;
 import org.opengis.metadata.Identifier;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.metadata.simple.SimpleCitation;
 import org.apache.sis.referencing.ImmutableIdentifier;
 import org.apache.sis.metadata.iso.citation.Citations;
diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java
index 3f5f3f13a6..1dec11b9e2 100644
--- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java
+++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/Band.java
@@ -40,7 +40,7 @@ import org.apache.sis.measure.NumberRange;
 import org.apache.sis.measure.Units;
 import org.apache.sis.util.resources.Vocabulary;
 
-import static org.apache.sis.internal.util.CollectionsExt.first;
+import static org.apache.sis.util.internal.CollectionsExt.first;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java
index 0cae81b135..91bfb30b03 100644
--- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java
+++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/BandGroup.java
@@ -30,7 +30,7 @@ import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.storage.base.StoreResource;
 import org.apache.sis.storage.base.MetadataBuilder;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.util.ArraysExt;
 
diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java
index 7e9ec45ab5..1d9e897e17 100644
--- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java
+++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStore.java
@@ -47,7 +47,7 @@ import org.apache.sis.storage.event.StoreListener;
 import org.apache.sis.storage.event.WarningEvent;
 import org.apache.sis.storage.base.URIDataStore;
 import org.apache.sis.storage.folder.ConcurrentCloser;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.iso.DefaultNameFactory;
 import org.apache.sis.setup.OptionKey;
 
diff --git a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
index 00ec81f0e9..26fa586a66 100644
--- a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
+++ b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/MetadataReader.java
@@ -66,11 +66,11 @@ import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.referencing.operation.provider.PolarStereographicB;
 import org.apache.sis.referencing.operation.provider.TransverseMercator;
 import org.apache.sis.storage.base.MetadataBuilder;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Strings;
 
-import static org.apache.sis.internal.util.CollectionsExt.singletonOrNull;
+import static org.apache.sis.util.internal.CollectionsExt.singletonOrNull;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java
index 003f2823a3..12156ecc20 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CRSBuilder.java
@@ -65,9 +65,9 @@ import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.referencing.operation.provider.PolarStereographicA;
 import org.apache.sis.referencing.operation.provider.PolarStereographicB;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.Vector;
 import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.iso.citation.Citations;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java
index ecd97282b6..c3e734e741 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/DataSubset.java
@@ -31,7 +31,7 @@ import org.opengis.util.GenericName;
 import org.apache.sis.image.DataType;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreContentException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.io.stream.Region;
 import org.apache.sis.io.stream.HyperRectangleReader;
 import org.apache.sis.storage.base.TiledGridCoverage;
@@ -50,7 +50,7 @@ import static java.lang.Math.addExact;
 import static java.lang.Math.subtractExact;
 import static java.lang.Math.multiplyExact;
 import static java.lang.Math.multiplyFull;
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
 import static java.lang.Math.toIntExact;
 
 
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
index bf30b3a89d..775ae43db0 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStore.java
@@ -51,8 +51,8 @@ import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.storage.base.StoreUtilities;
 import org.apache.sis.storage.base.URIDataStore;
 import org.apache.sis.storage.geotiff.spi.SchemaModifier;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.ListOfUnknownSize;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.ListOfUnknownSize;
 import org.apache.sis.metadata.iso.DefaultMetadata;
 import org.apache.sis.metadata.sql.MetadataStoreException;
 import org.apache.sis.util.collection.BackingStoreException;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
index 4e7c462dc0..aedecf2bae 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GeoTiffStoreProvider.java
@@ -31,7 +31,7 @@ import org.apache.sis.storage.StorageConnector;
 import org.apache.sis.storage.base.StoreMetadata;
 import org.apache.sis.storage.base.Capability;
 import org.apache.sis.storage.base.URIDataStore;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
index 4e74be4171..89d557baf8 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/GridGeometryBuilder.java
@@ -34,7 +34,7 @@ import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.storage.geotiff.internal.Resources;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.coverage.grid.GridOrientation;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
index a732504405..fee9edced1 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
@@ -43,9 +43,9 @@ import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.io.stream.ChannelDataInput;
 import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
 import org.apache.sis.coverage.grid.j2d.SampleModelFactory;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.metadata.iso.DefaultMetadata;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreContentException;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Type.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Type.java
index b2d5b877f5..201e31ce17 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Type.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Type.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import org.apache.sis.io.stream.ChannelDataInput;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.math.Fraction;
 import org.apache.sis.math.Vector;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/XMLMetadata.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/XMLMetadata.java
index eae81e9e8b..3d9c1cb5ea 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/XMLMetadata.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/XMLMetadata.java
@@ -38,7 +38,7 @@ import javax.xml.stream.events.StartElement;
 import javax.xml.transform.stax.StAXSource;
 import jakarta.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.util.collection.TreeTable;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CompressionChannel.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CompressionChannel.java
index e126da0c27..f3a8420944 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CompressionChannel.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/CompressionChannel.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import org.apache.sis.math.MathFunctions;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.storage.geotiff.internal.Resources;
 import org.apache.sis.io.stream.ChannelDataInput;
 import org.apache.sis.storage.event.StoreListeners;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/HorizontalPredictor.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/HorizontalPredictor.java
index c94c27aec6..3e1c3182cb 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/HorizontalPredictor.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/HorizontalPredictor.java
@@ -19,7 +19,7 @@ package org.apache.sis.storage.geotiff.inflater;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import org.apache.sis.image.DataType;
-import org.apache.sis.internal.jdk17.JDK17;
+import org.apache.sis.pending.jdk.JDK17;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/Inflater.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/Inflater.java
index bf17f92967..829edbb775 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/Inflater.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/Inflater.java
@@ -22,7 +22,7 @@ import java.io.IOException;
 import java.nio.Buffer;
 import org.apache.sis.image.DataType;
 import org.apache.sis.math.MathFunctions;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.storage.geotiff.internal.Compression;
 import org.apache.sis.storage.geotiff.internal.Predictor;
 import org.apache.sis.storage.geotiff.internal.Resources;
@@ -31,7 +31,7 @@ import org.apache.sis.storage.UnsupportedEncodingException;
 import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.util.ArgumentChecks;
 
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PredictorChannel.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PredictorChannel.java
index b79b640fd8..c215ec2f79 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PredictorChannel.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/inflater/PredictorChannel.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.storage.geotiff.internal.Predictor;
-import org.apache.sis.internal.jdk17.JDK17;
+import org.apache.sis.pending.jdk.JDK17;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java
index 6c567b39e4..09dc0d0338 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/MetadataReader.java
@@ -65,9 +65,9 @@ import org.apache.sis.io.stream.IOUtilities;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.storage.wkt.StoreFormat;
 import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.referencing.CRS;
@@ -81,7 +81,7 @@ import ucar.nc2.constants.CDM;
 import ucar.nc2.constants.CF;
 
 import static org.apache.sis.storage.netcdf.AttributeNames.*;
-import static org.apache.sis.internal.util.CollectionsExt.first;
+import static org.apache.sis.util.internal.CollectionsExt.first;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java
index b1f0790e8a..9ff6b6115d 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStore.java
@@ -36,8 +36,8 @@ import org.apache.sis.storage.Aggregate;
 import org.apache.sis.storage.netcdf.base.Decoder;
 import org.apache.sis.storage.netcdf.base.RasterResource;
 import org.apache.sis.storage.base.URIDataStore;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.setup.OptionKey;
 import org.apache.sis.storage.DataStoreClosedException;
 import org.apache.sis.storage.Resource;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
index 38c8062777..0d95525bea 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/NetcdfStoreProvider.java
@@ -35,8 +35,8 @@ import org.apache.sis.io.stream.IOUtilities;
 import org.apache.sis.storage.base.StoreMetadata;
 import org.apache.sis.storage.base.Capability;
 import org.apache.sis.storage.base.URIDataStore;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.system.Modules;
 import org.apache.sis.setup.GeometryLibrary;
 import org.apache.sis.setup.OptionKey;
 import org.apache.sis.storage.DataStore;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java
index 2fabe2e220..d7eec9ac5d 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Axis.java
@@ -38,7 +38,7 @@ import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.referencing.operation.TransformException;
 import org.opengis.metadata.content.TransferFunctionType;
 import org.apache.sis.referencing.util.AxisDirections;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.storage.netcdf.internal.Resources;
 import org.apache.sis.referencing.operation.builder.LocalizationGridException;
 import org.apache.sis.referencing.operation.builder.LocalizationGridBuilder;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java
index ae77608ff2..bce9c3745a 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Convention.java
@@ -35,7 +35,7 @@ import org.apache.sis.referencing.operation.transform.TransferFunction;
 import org.apache.sis.referencing.datum.BursaWolfParameters;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.coverage.grid.j2d.ColorModelFactory;
-import org.apache.sis.internal.system.Reflect;
+import org.apache.sis.system.Reflect;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.coverage.Category;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
index 586b81bd83..c0fb791b38 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Decoder.java
@@ -44,8 +44,8 @@ import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.logging.PerformanceLevel;
 import org.apache.sis.util.collection.TreeTable;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.system.Modules;
 import org.apache.sis.referencing.util.ReferencingFactoryContainer;
 import org.apache.sis.util.iso.DefaultNameFactory;
 import ucar.nc2.constants.CF;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
index fb5d83943e..6540d167b8 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/FeatureSet.java
@@ -37,9 +37,9 @@ import org.opengis.referencing.crs.TemporalCRS;
 import org.opengis.metadata.acquisition.GeometryType;
 import org.apache.sis.referencing.crs.DefaultTemporalCRS;
 import org.apache.sis.coverage.grid.GridExtent;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.system.Configuration;
 import org.apache.sis.feature.internal.MovingFeatures;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.feature.builder.AttributeRole;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridCacheKey.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridCacheKey.java
index 64a0678feb..f974047eaa 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridCacheKey.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridCacheKey.java
@@ -22,7 +22,7 @@ import java.util.EnumSet;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import org.apache.sis.util.collection.Cache;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.io.stream.ByteWriter;
 import org.apache.sis.math.Vector;
 
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
index a25a90bbb9..ff038921f7 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java
@@ -65,8 +65,8 @@ import org.apache.sis.storage.netcdf.internal.Resources;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.referencing.operation.provider.PseudoPlateCarree;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/HYCOM.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/HYCOM.java
index 4a3eae40bd..0caafcc0c1 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/HYCOM.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/HYCOM.java
@@ -25,7 +25,7 @@ import java.util.GregorianCalendar;
 import org.apache.sis.math.Vector;
 import org.apache.sis.measure.Units;
 import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.StandardDateFormat;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Linearizer.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Linearizer.java
index 6bea1a933b..a95a8f3bb0 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Linearizer.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Linearizer.java
@@ -33,7 +33,7 @@ import org.apache.sis.referencing.operation.transform.MathTransforms;
 import org.apache.sis.referencing.operation.builder.LocalizationGridBuilder;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.referencing.util.AxisDirections;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.storage.DataStoreReferencingException;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java
index 0da4c47638..5d4505cdd8 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/NamedElement.java
@@ -21,8 +21,8 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.CharSequences;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.base.StoreUtilities;
 import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.util.resources.IndexedResourceBundle;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Node.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Node.java
index 00a9c838de..d148c28d75 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Node.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Node.java
@@ -22,7 +22,7 @@ import org.apache.sis.math.Vector;
 import org.apache.sis.math.DecimalFunctions;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.netcdf.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java
index 280752bffa..ddd79f56e7 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/RasterResource.java
@@ -32,8 +32,8 @@ import org.opengis.metadata.Metadata;
 import org.opengis.referencing.operation.MathTransform1D;
 import org.opengis.referencing.operation.TransformException;
 import org.apache.sis.storage.base.ResourceOnFileSystem;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.coverage.internal.RangeArgument;
 import org.apache.sis.coverage.grid.j2d.RasterFactory;
 import org.apache.sis.coverage.SampleDimension;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java
index d0c972ee1b..70af3ff28d 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/Variable.java
@@ -40,9 +40,9 @@ import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.netcdf.AttributeNames;
 import org.apache.sis.storage.netcdf.internal.Resources;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
index c9767552fe..be2727910d 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/ChannelDecoder.java
@@ -50,9 +50,9 @@ import org.apache.sis.storage.netcdf.base.Dimension;
 import org.apache.sis.storage.netcdf.base.Convention;
 import org.apache.sis.storage.netcdf.base.NamedElement;
 import org.apache.sis.io.stream.ChannelDataInput;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreContentException;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java
index e1fd59008e..98791ed360 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/GridInfo.java
@@ -27,7 +27,7 @@ import org.apache.sis.storage.netcdf.base.Grid;
 import org.apache.sis.storage.netcdf.base.Decoder;
 import org.apache.sis.storage.netcdf.base.Dimension;
 import org.apache.sis.storage.netcdf.internal.Resources;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.DataStoreContentException;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
index 4b3355a1a0..885a4f8cc1 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/classic/VariableInfo.java
@@ -44,8 +44,8 @@ import org.apache.sis.storage.base.StoreUtilities;
 import org.apache.sis.io.stream.ChannelDataInput;
 import org.apache.sis.io.stream.HyperRectangleReader;
 import org.apache.sis.io.stream.Region;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreContentException;
 import org.apache.sis.storage.netcdf.AttributeNames;
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DimensionWrapper.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DimensionWrapper.java
index dcdfbf45dc..0d272c2440 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DimensionWrapper.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/DimensionWrapper.java
@@ -18,7 +18,7 @@ package org.apache.sis.storage.netcdf.ucar;
 
 import java.util.List;
 import java.util.Collection;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.ArraysExt;
 import ucar.nc2.Dimension;
 
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java
index ca0a22b8a2..8393a88888 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/GridWrapper.java
@@ -30,7 +30,7 @@ import org.apache.sis.storage.netcdf.base.Axis;
 import org.apache.sis.storage.netcdf.base.Grid;
 import org.apache.sis.storage.netcdf.base.Decoder;
 import org.apache.sis.storage.netcdf.base.Variable;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.util.ArraysExt;
 
diff --git a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/VariableWrapper.java b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/VariableWrapper.java
index e0d0c2a2ad..90b729c242 100644
--- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/VariableWrapper.java
+++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/ucar/VariableWrapper.java
@@ -47,7 +47,7 @@ import org.apache.sis.storage.netcdf.base.DataType;
 import org.apache.sis.storage.netcdf.base.Decoder;
 import org.apache.sis.storage.netcdf.base.Grid;
 import org.apache.sis.storage.netcdf.base.GridAdjustment;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.measure.MeasurementRange;
 import org.apache.sis.measure.NumberRange;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
index 8b2e130b2d..ea68621ff4 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
@@ -40,7 +40,7 @@ import org.apache.sis.storage.sql.feature.Database;
 import org.apache.sis.storage.sql.feature.Resources;
 import org.apache.sis.storage.sql.feature.SchemaModifier;
 import org.apache.sis.storage.base.MetadataBuilder;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.setup.GeometryLibrary;
 import org.apache.sis.setup.OptionKey;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/BinaryEncoding.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/BinaryEncoding.java
index d5642ce73b..9ca0cb3cc1 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/BinaryEncoding.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/BinaryEncoding.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import org.apache.sis.internal.jdk17.HexFormat;
+import org.apache.sis.pending.jdk.HexFormat;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Column.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Column.java
index e2c9015997..78c7d154be 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Column.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Column.java
@@ -27,7 +27,7 @@ import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.apache.sis.metadata.sql.util.Reflection;
 import org.apache.sis.metadata.sql.util.SQLUtilities;
 import org.apache.sis.geometry.wrapper.GeometryType;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.DataStoreContentException;
 import org.apache.sis.feature.builder.AttributeTypeBuilder;
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
index ce76728f7a..1e1d035e33 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
@@ -46,8 +46,8 @@ import org.apache.sis.metadata.sql.util.SQLBuilder;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.geometry.wrapper.GeometryType;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.sql.postgis.Postgres;
 import org.apache.sis.storage.sql.SQLStore;
 import org.apache.sis.storage.sql.ResourceDefinition;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAnalyzer.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAnalyzer.java
index e35a5c94f2..828aa77b53 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAnalyzer.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAnalyzer.java
@@ -31,7 +31,7 @@ import org.apache.sis.feature.builder.AssociationRoleBuilder;
 import org.apache.sis.feature.builder.AttributeTypeBuilder;
 import org.apache.sis.feature.builder.AttributeRole;
 import org.apache.sis.geometry.wrapper.Geometries;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.Numbers;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
index d3db7b6066..f341c37e58 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
@@ -32,7 +32,7 @@ import org.apache.sis.metadata.sql.util.SQLBuilder;
 import org.apache.sis.util.stream.DeferredStream;
 import org.apache.sis.util.stream.PaginedStream;
 import org.apache.sis.filter.internal.SortByComparator;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.util.collection.BackingStoreException;
 import org.apache.sis.util.ArgumentChecks;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
index 674b6afdc5..c3478b99bd 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
@@ -41,8 +41,8 @@ import org.apache.sis.referencing.util.DefinitionVerifier;
 import org.apache.sis.referencing.util.ReferencingUtilities;
 import org.apache.sis.metadata.sql.util.SQLBuilder;
 import org.apache.sis.geometry.wrapper.GeometryType;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.system.Modules;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.io.wkt.WKTFormat;
 import org.apache.sis.io.wkt.Warnings;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/PrimaryKey.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/PrimaryKey.java
index 5102987bfb..b80b45802b 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/PrimaryKey.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/PrimaryKey.java
@@ -18,8 +18,8 @@ package org.apache.sis.storage.sql.feature;
 
 import java.util.List;
 import java.util.Collection;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/QueryAnalyzer.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/QueryAnalyzer.java
index 50fa2f8c85..f90b93a193 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/QueryAnalyzer.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/QueryAnalyzer.java
@@ -26,7 +26,7 @@ import java.sql.ResultSetMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import org.opengis.util.GenericName;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.metadata.sql.util.Reflection;
 
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
index e758fde43a..3fa80b1d32 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
@@ -26,7 +26,7 @@ import java.util.Objects;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.DatabaseMetaData;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.sql.util.Reflection;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreContentException;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableAnalyzer.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableAnalyzer.java
index 9e6cb6ef09..f6470dc461 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableAnalyzer.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableAnalyzer.java
@@ -25,7 +25,7 @@ import java.sql.ResultSet;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.metadata.sql.util.Reflection;
 import org.apache.sis.metadata.sql.util.SQLUtilities;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableReference.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableReference.java
index bd43eeaa52..583b6308b4 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableReference.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableReference.java
@@ -27,7 +27,7 @@ import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.Debug;
 
-import static org.apache.sis.internal.util.Strings.trimOrNull;
+import static org.apache.sis.util.internal.Strings.trimOrNull;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/ValueGetter.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/ValueGetter.java
index 844ad517eb..c937be9df3 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/ValueGetter.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/ValueGetter.java
@@ -33,8 +33,8 @@ import java.math.BigDecimal;
 import org.apache.sis.math.Vector;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
index 57ddbb5c8f..5b3f4be777 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
@@ -49,8 +49,8 @@ import org.apache.sis.referencing.util.j2d.AffineTransform2D;
 import org.apache.sis.io.stream.InputStreamArrayGetter;
 import org.apache.sis.io.stream.ChannelDataInput;
 import org.apache.sis.storage.sql.feature.InfoStatements;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.math.Vector;
diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Metadata.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Metadata.java
index 2637959c81..f0064f9b7f 100644
--- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Metadata.java
+++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Metadata.java
@@ -44,7 +44,7 @@ import org.opengis.util.InternationalString;
 
 import org.apache.sis.io.TableAppender;
 import org.apache.sis.metadata.simple.SimpleMetadata;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.metadata.iso.citation.DefaultCitationDate;
 import org.apache.sis.metadata.iso.identification.DefaultKeywords;
diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
index fd7a5dc504..070eafdbb7 100644
--- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
+++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
@@ -44,9 +44,9 @@ import org.apache.sis.storage.base.URIDataStore;
 import org.apache.sis.io.stream.ChannelFactory;
 import org.apache.sis.io.stream.IOUtilities;
 import org.apache.sis.io.stream.Markable;
-import org.apache.sis.internal.util.AbstractMap;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.AbstractMap;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.io.wkt.WKTFormat;
 import org.apache.sis.io.InvalidSeekException;
 import org.apache.sis.storage.ConcurrentReadException;
diff --git a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
index d60a16a874..e03b523742 100644
--- a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
+++ b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxStreamReader.java
@@ -39,8 +39,8 @@ import jakarta.xml.bind.Unmarshaller;
 import jakarta.xml.bind.JAXBElement;
 import jakarta.xml.bind.JAXBException;
 import org.apache.sis.xml.bind.Context;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.io.stream.IOUtilities;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.DataStoreContentException;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java
index 441bdd87f7..d2225eff51 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelDataOutput.java
@@ -29,7 +29,7 @@ import java.nio.LongBuffer;
 import java.nio.ShortBuffer;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.channels.WritableByteChannel;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.storage.internal.Resources;
 
 import static org.apache.sis.util.ArgumentChecks.ensureBetween;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelFactory.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelFactory.java
index 13d0df98e7..c4fead68d3 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelFactory.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/ChannelFactory.java
@@ -44,7 +44,7 @@ import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.storage.base.StoreUtilities;
 import org.apache.sis.storage.DataStoreException;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/FileCacheByteChannel.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/FileCacheByteChannel.java
index dd3d466de0..7eed300efa 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/FileCacheByteChannel.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/FileCacheByteChannel.java
@@ -29,9 +29,9 @@ import java.nio.channels.SeekableByteChannel;
 import java.nio.channels.NonWritableChannelException;
 import org.apache.sis.storage.StorageConnector;
 import org.apache.sis.storage.internal.Resources;
-import org.apache.sis.internal.system.DelayedExecutor;
-import org.apache.sis.internal.system.DelayedRunnable;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.DelayedExecutor;
+import org.apache.sis.system.DelayedRunnable;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.CharSequences;
@@ -83,7 +83,7 @@ public abstract class FileCacheByteChannel extends ByteRangeChannel {
      * Information about an input stream and its range of bytes.
      * This is the return value of {@link #openConnection(long, long)}.
      */
-    protected static final class Connection extends org.apache.sis.internal.jdk17.Record {
+    protected static final class Connection extends org.apache.sis.pending.jdk.Record {
         /** The unit of ranges used in HTTP connections. */
         private static final String RANGES_UNIT = "bytes";
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java
index 75fdb516d0..d47ad79c7c 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/IOUtilities.java
@@ -44,7 +44,7 @@ import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Exceptions;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 import org.apache.sis.storage.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/Region.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/Region.java
index 40c1e645cf..db78c7a041 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/Region.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/io/stream/Region.java
@@ -23,7 +23,7 @@ import static java.lang.Math.subtractExact;
 import static java.lang.Math.multiplyExact;
 import static java.lang.Math.incrementExact;
 import static java.lang.Math.toIntExact;
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java
index 5c9363ceac..33e5bb4e49 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/AbstractGridCoverageResource.java
@@ -37,7 +37,7 @@ import org.apache.sis.measure.Longitude;
 import org.apache.sis.measure.AngleFormat;
 import org.apache.sis.util.logging.PerformanceLevel;
 import org.apache.sis.io.stream.IOUtilities;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.storage.internal.Resources;
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java
index 8d71dda710..85112599a7 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/CoverageSubset.java
@@ -37,7 +37,7 @@ import org.apache.sis.referencing.util.DirectPositionView;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.storage.base.StoreUtilities;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStore.java
index c7c5406b27..b904da3666 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStore.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStore.java
@@ -33,7 +33,7 @@ import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.collection.TableColumn;
 import org.apache.sis.storage.base.StoreUtilities;
 import org.apache.sis.storage.internal.Resources;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.referencing.NamedIdentifier;
 import org.apache.sis.storage.event.CloseEvent;
 import org.apache.sis.storage.event.StoreEvent;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java
index 629e055867..de0d35bcaf 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataStoreRegistry.java
@@ -20,9 +20,9 @@ import java.util.List;
 import java.util.LinkedList;
 import java.util.Iterator;
 import java.util.ServiceLoader;
-import org.apache.sis.internal.system.Reflect;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.SystemListener;
+import org.apache.sis.system.Reflect;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.SystemListener;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.storage.base.StoreMetadata;
 import org.apache.sis.referencing.util.LazySet;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureNaming.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureNaming.java
index ce7cc86db7..9287ddd1ab 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureNaming.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureNaming.java
@@ -25,7 +25,7 @@ import org.opengis.util.GenericName;
 import org.opengis.util.ScopedName;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.storage.internal.Resources;
 
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/ProbeResult.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/ProbeResult.java
index 356da9da25..72cf0c7c1b 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/ProbeResult.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/ProbeResult.java
@@ -20,7 +20,7 @@ import java.util.Objects;
 import java.io.Serializable;
 import java.io.ObjectStreamException;
 import org.apache.sis.util.Version;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
index ba5964ab51..7366316c38 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
@@ -70,8 +70,8 @@ import org.apache.sis.io.stream.ChannelImageOutputStream;
 import org.apache.sis.io.stream.InputStreamAdapter;
 import org.apache.sis.io.stream.RewindableLineReader;
 import org.apache.sis.io.stream.InternalOptionKey;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.io.InvalidSeekException;
 import org.apache.sis.setup.OptionKey;
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java
index e309420b3d..2763e8c921 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/BandAggregateGridResource.java
@@ -36,7 +36,7 @@ import org.apache.sis.storage.AbstractGridCoverageResource;
 import org.apache.sis.storage.RasterLoadingStrategy;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.event.StoreListeners;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.collection.BackingStoreException;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java
index 5738a896f0..5e9a9be1ef 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java
@@ -28,8 +28,8 @@ import org.apache.sis.storage.DataStoreContentException;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.internal.util.CollectionsExt;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.CollectionsExt;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.storage.AbstractFeatureSet;
 import org.apache.sis.storage.Query;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
index e2e02f882b..c6d172e28c 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java
@@ -29,7 +29,7 @@ import org.apache.sis.coverage.grid.DisjointExtentException;
 import org.apache.sis.storage.GridCoverageResource;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.internal.Resources;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.util.logging.Logging;
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java
index 762c66ceea..12eef3f5af 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java
@@ -40,8 +40,8 @@ import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.storage.base.MemoryGridResource;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.coverage.internal.RangeArgument;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.ArraysExt;
 
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionSelector.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionSelector.java
index a01e57dcfb..93dcc0db22 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionSelector.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionSelector.java
@@ -18,7 +18,7 @@ package org.apache.sis.storage.aggregate;
 
 import java.util.Arrays;
 import java.math.BigInteger;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSlice.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSlice.java
index 11d2c1f048..bad2c0e84b 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSlice.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GridSlice.java
@@ -29,7 +29,7 @@ import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.coverage.internal.CommonDomainFinder;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/Group.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/Group.java
index 649eec3ae6..1c430ec4bc 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/Group.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/Group.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.stream.Stream;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.event.StoreListeners;
 
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java
index f76ad61195..b0de8ef0d0 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/GroupAggregate.java
@@ -31,8 +31,8 @@ import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.GridCoverageResource;
 import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.storage.base.MetadataBuilder;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.ImmutableEnvelope;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/MergeStrategy.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/MergeStrategy.java
index fc690f051a..ada6b59f51 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/MergeStrategy.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/MergeStrategy.java
@@ -24,7 +24,7 @@ import org.apache.sis.coverage.grid.GridCoverage;
 import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.SubspaceNotSpecifiedException;
 import org.apache.sis.referencing.util.ExtentSelector;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java
index 50f1ee6894..794a498346 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/CodeType.java
@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
 import org.apache.sis.util.CharSequences;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.DefinitionURI;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.DefinitionURI;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java
index e06c035411..8f59b5e1f3 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/DocumentedStoreProvider.java
@@ -23,7 +23,7 @@ import org.apache.sis.metadata.sql.MetadataSource;
 import org.apache.sis.metadata.sql.MetadataStoreException;
 import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.storage.internal.Resources;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Modules;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
index 25a21d6a3c..2ef96a149d 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java
@@ -56,7 +56,7 @@ import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.crs.VerticalCRS;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.simple.SimpleDuration;
 import org.apache.sis.geometry.AbstractEnvelope;
 import org.apache.sis.metadata.ModifiableMetadata;
@@ -83,7 +83,7 @@ import org.apache.sis.coverage.grid.GridGeometry;
 import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.coverage.SampleDimension;
 import org.apache.sis.metadata.internal.Merger;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.AbstractInternationalString;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.ArgumentChecks;
@@ -93,7 +93,7 @@ import org.apache.sis.util.iso.Names;
 import org.apache.sis.util.iso.Types;
 import org.apache.sis.measure.Units;
 
-import static org.apache.sis.internal.util.StandardDateFormat.MILLISECONDS_PER_DAY;
+import static org.apache.sis.util.internal.StandardDateFormat.MILLISECONDS_PER_DAY;
 
 // Branch-dependent imports
 import org.opengis.temporal.Duration;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
index 994b568daa..83ad24a1ce 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/ResourceLineage.java
@@ -26,12 +26,12 @@ import org.opengis.metadata.identification.Resolution;
 import org.opengis.metadata.identification.Identification;
 import org.opengis.referencing.ReferenceSystem;
 import org.opengis.util.InternationalString;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.util.internal.CollectionsExt;
 import org.apache.sis.metadata.iso.extent.Extents;
 import org.apache.sis.metadata.iso.lineage.DefaultSource;
 import org.apache.sis.metadata.iso.maintenance.DefaultScope;
 
-import static org.apache.sis.internal.util.CollectionsExt.nonNull;
+import static org.apache.sis.util.internal.CollectionsExt.nonNull;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java
index ed1383a8f0..6a9ad823eb 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/StoreUtilities.java
@@ -47,8 +47,8 @@ import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.geometry.GeneralEnvelope;
 import org.apache.sis.metadata.internal.Identifiers;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.system.Modules;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Classes;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java
index 95d3a4415c..0ce6a54bf6 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java
@@ -48,7 +48,7 @@ import static java.lang.Math.incrementExact;
 import static java.lang.Math.decrementExact;
 import static java.lang.Math.toIntExact;
 import static java.lang.Math.floorDiv;
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/GeometryParser.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/GeometryParser.java
index 3edeb9eef0..ebe81c0de1 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/GeometryParser.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/GeometryParser.java
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.storage.csv;
 
-import org.apache.sis.internal.converter.SurjectiveConverter;
+import org.apache.sis.converter.SurjectiveConverter;
 import org.apache.sis.util.CharSequences;
 
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
index c30f93af81..ff7dd9bde1 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
@@ -28,7 +28,7 @@ import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.feature.internal.MovingFeatures;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.util.CorruptedObjectException;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 // Branch-dependent imports
 import org.opengis.feature.Attribute;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
index eb51ffb81f..d5e5fe89b9 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
@@ -50,9 +50,9 @@ import org.apache.sis.feature.FoliationRepresentation;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.referencing.util.GeodeticObjectBuilder;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.io.stream.IOUtilities;
 import org.apache.sis.io.stream.RewindableLineReader;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
index 6e84aa1769..ca54b21a25 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
@@ -20,8 +20,8 @@ import java.time.Instant;
 import javax.measure.Unit;
 import javax.measure.quantity.Time;
 import org.opengis.referencing.datum.TemporalDatum;
-import org.apache.sis.internal.converter.SurjectiveConverter;
-import org.apache.sis.internal.util.StandardDateFormat;
+import org.apache.sis.converter.SurjectiveConverter;
+import org.apache.sis.util.internal.StandardDateFormat;
 import org.apache.sis.referencing.CommonCRS;
 import org.apache.sis.measure.Units;
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/CharactersView.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/CharactersView.java
index f333fdaa49..a6d6e90062 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/CharactersView.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/CharactersView.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.io.EOFException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
-import org.apache.sis.internal.jdk17.JDK17;
+import org.apache.sis.pending.jdk.JDK17;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.io.stream.ChannelDataInput;
 import org.apache.sis.storage.DataStoreContentException;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java
index 8d7f95875f..6f2d8f0051 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java
@@ -50,8 +50,8 @@ import org.apache.sis.coverage.grid.j2d.ImageUtilities;
 import org.apache.sis.coverage.grid.j2d.ObservableImage;
 import org.apache.sis.coverage.internal.RangeArgument;
 import org.apache.sis.storage.internal.Resources;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArraysExt;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterReader.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterReader.java
index 566540eccb..c648c830aa 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterReader.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterReader.java
@@ -43,8 +43,8 @@ import static java.lang.Math.addExact;
 import static java.lang.Math.multiplyExact;
 import static java.lang.Math.multiplyFull;
 import static java.lang.Math.incrementExact;
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
-import static org.apache.sis.internal.util.Numerics.wholeDiv;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.wholeDiv;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStore.java
index 84f1eeca39..06841e7aae 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStore.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStore.java
@@ -50,8 +50,8 @@ import org.apache.sis.util.ArraysExt;
 import org.apache.sis.image.DataType;
 
 import static java.lang.Math.multiplyExact;
-import static org.apache.sis.internal.util.Numerics.ceilDiv;
-import static org.apache.sis.internal.util.Numerics.wholeDiv;
+import static org.apache.sis.util.internal.Numerics.ceilDiv;
+import static org.apache.sis.util.internal.Numerics.wholeDiv;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/event/StoreListeners.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/event/StoreListeners.java
index 0d5bc554f6..ef16847cff 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/event/StoreListeners.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/event/StoreListeners.java
@@ -39,7 +39,7 @@ import org.apache.sis.util.collection.Containers;
 import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.storage.base.StoreResource;
 import org.apache.sis.storage.base.StoreUtilities;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.storage.DataStoreProvider;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.Resource;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/ConcurrentCloser.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/ConcurrentCloser.java
index f6dbb8252b..5a7c30f5e6 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/ConcurrentCloser.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/ConcurrentCloser.java
@@ -25,7 +25,7 @@ import org.apache.sis.storage.Resource;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.base.StoreResource;
-import org.apache.sis.internal.system.CommonExecutor;
+import org.apache.sis.system.CommonExecutor;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java
index 5f1d1c2f58..cfc3bd4006 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java
@@ -50,7 +50,7 @@ import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.UnsupportedStorageException;
 import org.apache.sis.storage.aggregate.CoverageAggregator;
 import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.storage.base.StoreUtilities;
 import org.apache.sis.storage.base.StoreResource;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
index 8142ed9a8e..90b3ede663 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
@@ -45,7 +45,7 @@ import org.apache.sis.storage.base.StoreResource;
 import org.apache.sis.io.stream.IOUtilities;
 import org.apache.sis.coverage.internal.RangeArgument;
 import org.apache.sis.coverage.grid.j2d.ImageUtilities;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.iso.Names;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java
index 8c5f5d1d44..0ccae478eb 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java
@@ -53,7 +53,7 @@ import org.apache.sis.storage.internal.Resources;
 import org.apache.sis.storage.base.PRJDataStore;
 import org.apache.sis.referencing.util.j2d.AffineTransform2D;
 import org.apache.sis.storage.base.MetadataBuilder;
-import org.apache.sis.internal.util.ListOfUnknownSize;
+import org.apache.sis.util.internal.ListOfUnknownSize;
 import org.apache.sis.metadata.sql.MetadataStoreException;
 import org.apache.sis.util.collection.BackingStoreException;
 import org.apache.sis.util.resources.Errors;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java
index ecd30d0d2a..926336a729 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java
@@ -33,7 +33,7 @@ import org.apache.sis.geometry.wrapper.Geometries;
 import org.apache.sis.geometry.wrapper.GeometryWrapper;
 import org.apache.sis.referencing.util.DefinitionVerifier;
 import org.apache.sis.storage.internal.Resources;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.storage.event.StoreListeners;
 import org.apache.sis.util.ArraysExt;
 
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
index 850505f7a7..4c9497a029 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
@@ -36,7 +36,7 @@ import org.apache.sis.storage.UnsupportedStorageException;
 import org.apache.sis.storage.event.WarningEvent;
 import org.apache.sis.metadata.iso.DefaultMetadata;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.system.Loggers;
 import org.apache.sis.storage.base.URIDataStore;
 import org.apache.sis.storage.base.MetadataBuilder;
 import org.apache.sis.referencing.util.DefinitionVerifier;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/CoverageReadConsistency.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/CoverageReadConsistency.java
index 2d62ce352a..064f2d8c88 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/CoverageReadConsistency.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/CoverageReadConsistency.java
@@ -30,8 +30,8 @@ import org.apache.sis.coverage.grid.GridExtent;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.GridCoverageResource;
 import org.apache.sis.storage.RasterLoadingStrategy;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.image.PixelIterator;
 import org.apache.sis.math.Statistics;
 import org.apache.sis.math.StatisticsFormat;
diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/SubsampledImage.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/SubsampledImage.java
index de18dd8de0..6ed8e2f4d5 100644
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/SubsampledImage.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/test/storage/SubsampledImage.java
@@ -28,7 +28,7 @@ import java.awt.image.PixelInterleavedSampleModel;
 import java.awt.image.RenderedImage;
 import java.awt.image.WritableRaster;
 import org.apache.sis.image.PlanarImage;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 
 import static java.lang.StrictMath.floorDiv;
 import static org.junit.Assert.*;
diff --git a/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter b/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter
index 0daa52e916..7d19bb3d96 100644
--- a/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter
+++ b/endorsed/src/org.apache.sis.util/main/META-INF/services/org.apache.sis.util.ObjectConverter
@@ -1,43 +1,43 @@
 # Workaround for Maven bug https://issues.apache.org/jira/browse/MNG-7855
 # The content of this file is automatically derived from module-info.class file.
 # Should be used only if the JAR file was on class-path rather than module-path.
-org.apache.sis.internal.converter.StringConverter$Number
-org.apache.sis.internal.converter.StringConverter$Byte
-org.apache.sis.internal.converter.StringConverter$Short
-org.apache.sis.internal.converter.StringConverter$Integer
-org.apache.sis.internal.converter.StringConverter$Long
-org.apache.sis.internal.converter.StringConverter$Float
-org.apache.sis.internal.converter.StringConverter$Double
-org.apache.sis.internal.converter.StringConverter$BigInteger
-org.apache.sis.internal.converter.StringConverter$BigDecimal
-org.apache.sis.internal.converter.StringConverter$Boolean
-org.apache.sis.internal.converter.StringConverter$Locale
-org.apache.sis.internal.converter.StringConverter$Charset
-org.apache.sis.internal.converter.StringConverter$InternationalString
-org.apache.sis.internal.converter.StringConverter$File
-org.apache.sis.internal.converter.StringConverter$Path
-org.apache.sis.internal.converter.StringConverter$URI
-org.apache.sis.internal.converter.StringConverter$URL
-org.apache.sis.internal.converter.StringConverter$Unit
-org.apache.sis.internal.converter.StringConverter$Angle
-org.apache.sis.internal.converter.AngleConverter
-org.apache.sis.internal.converter.AngleConverter$Inverse
-org.apache.sis.internal.converter.PathConverter$FilePath
-org.apache.sis.internal.converter.PathConverter$URLPath
-org.apache.sis.internal.converter.PathConverter$URIPath
-org.apache.sis.internal.converter.PathConverter$PathURI
-org.apache.sis.internal.converter.PathConverter$PathURL
-org.apache.sis.internal.converter.PathConverter$PathFile
-org.apache.sis.internal.converter.PathConverter$FileURI
-org.apache.sis.internal.converter.PathConverter$FileURL
-org.apache.sis.internal.converter.PathConverter$URLFile
-org.apache.sis.internal.converter.PathConverter$URIFile
-org.apache.sis.internal.converter.PathConverter$URL_URI
-org.apache.sis.internal.converter.PathConverter$URI_URL
-org.apache.sis.internal.converter.DateConverter$Long
-org.apache.sis.internal.converter.DateConverter$SQL
-org.apache.sis.internal.converter.DateConverter$Timestamp
-org.apache.sis.internal.converter.CollectionConverter$List
-org.apache.sis.internal.converter.CollectionConverter$Set
-org.apache.sis.internal.converter.FractionConverter
-org.apache.sis.internal.converter.FractionConverter$FromInteger
+org.apache.sis.converter.StringConverter$Number
+org.apache.sis.converter.StringConverter$Byte
+org.apache.sis.converter.StringConverter$Short
+org.apache.sis.converter.StringConverter$Integer
+org.apache.sis.converter.StringConverter$Long
+org.apache.sis.converter.StringConverter$Float
+org.apache.sis.converter.StringConverter$Double
+org.apache.sis.converter.StringConverter$BigInteger
+org.apache.sis.converter.StringConverter$BigDecimal
+org.apache.sis.converter.StringConverter$Boolean
+org.apache.sis.converter.StringConverter$Locale
+org.apache.sis.converter.StringConverter$Charset
+org.apache.sis.converter.StringConverter$InternationalString
+org.apache.sis.converter.StringConverter$File
+org.apache.sis.converter.StringConverter$Path
+org.apache.sis.converter.StringConverter$URI
+org.apache.sis.converter.StringConverter$URL
+org.apache.sis.converter.StringConverter$Unit
+org.apache.sis.converter.StringConverter$Angle
+org.apache.sis.converter.AngleConverter
+org.apache.sis.converter.AngleConverter$Inverse
+org.apache.sis.converter.PathConverter$FilePath
+org.apache.sis.converter.PathConverter$URLPath
+org.apache.sis.converter.PathConverter$URIPath
+org.apache.sis.converter.PathConverter$PathURI
+org.apache.sis.converter.PathConverter$PathURL
+org.apache.sis.converter.PathConverter$PathFile
+org.apache.sis.converter.PathConverter$FileURI
+org.apache.sis.converter.PathConverter$FileURL
+org.apache.sis.converter.PathConverter$URLFile
+org.apache.sis.converter.PathConverter$URIFile
+org.apache.sis.converter.PathConverter$URL_URI
+org.apache.sis.converter.PathConverter$URI_URL
+org.apache.sis.converter.DateConverter$Long
+org.apache.sis.converter.DateConverter$SQL
+org.apache.sis.converter.DateConverter$Timestamp
+org.apache.sis.converter.CollectionConverter$List
+org.apache.sis.converter.CollectionConverter$Set
+org.apache.sis.converter.FractionConverter
+org.apache.sis.converter.FractionConverter$FromInteger
diff --git a/endorsed/src/org.apache.sis.util/main/module-info.java b/endorsed/src/org.apache.sis.util/main/module-info.java
index f7132f8ec9..9023c40490 100644
--- a/endorsed/src/org.apache.sis.util/main/module-info.java
+++ b/endorsed/src/org.apache.sis.util/main/module-info.java
@@ -44,50 +44,50 @@ module org.apache.sis.util {
         with org.apache.sis.measure.UnitServices;
 
     provides org.apache.sis.util.ObjectConverter
-        with org.apache.sis.internal.converter.StringConverter.Number,
-             org.apache.sis.internal.converter.StringConverter.Byte,
-             org.apache.sis.internal.converter.StringConverter.Short,
-             org.apache.sis.internal.converter.StringConverter.Integer,
-             org.apache.sis.internal.converter.StringConverter.Long,
-             org.apache.sis.internal.converter.StringConverter.Float,
-             org.apache.sis.internal.converter.StringConverter.Double,
-             org.apache.sis.internal.converter.StringConverter.BigInteger,
-             org.apache.sis.internal.converter.StringConverter.BigDecimal,
-             org.apache.sis.internal.converter.StringConverter.Boolean,
-             org.apache.sis.internal.converter.StringConverter.Locale,
-             org.apache.sis.internal.converter.StringConverter.Charset,
-             org.apache.sis.internal.converter.StringConverter.InternationalString,
-             org.apache.sis.internal.converter.StringConverter.File,
-             org.apache.sis.internal.converter.StringConverter.Path,
-             org.apache.sis.internal.converter.StringConverter.URI,
-             org.apache.sis.internal.converter.StringConverter.URL,
-             org.apache.sis.internal.converter.StringConverter.Unit,
-             org.apache.sis.internal.converter.StringConverter.Angle,
-             org.apache.sis.internal.converter.AngleConverter,
-             org.apache.sis.internal.converter.AngleConverter.Inverse,
-             org.apache.sis.internal.converter.PathConverter.FilePath,
-             org.apache.sis.internal.converter.PathConverter.URLPath,
-             org.apache.sis.internal.converter.PathConverter.URIPath,
-             org.apache.sis.internal.converter.PathConverter.PathURI,
-             org.apache.sis.internal.converter.PathConverter.PathURL,
-             org.apache.sis.internal.converter.PathConverter.PathFile,
-             org.apache.sis.internal.converter.PathConverter.FileURI,
-             org.apache.sis.internal.converter.PathConverter.FileURL,
-             org.apache.sis.internal.converter.PathConverter.URLFile,
-             org.apache.sis.internal.converter.PathConverter.URIFile,
-             org.apache.sis.internal.converter.PathConverter.URL_URI,
-             org.apache.sis.internal.converter.PathConverter.URI_URL,
-             org.apache.sis.internal.converter.DateConverter.Long,
-             org.apache.sis.internal.converter.DateConverter.SQL,
-             org.apache.sis.internal.converter.DateConverter.Timestamp,
-             org.apache.sis.internal.converter.CollectionConverter.List,
-             org.apache.sis.internal.converter.CollectionConverter.Set,
-             org.apache.sis.internal.converter.FractionConverter,
-             org.apache.sis.internal.converter.FractionConverter.FromInteger;
+        with org.apache.sis.converter.StringConverter.Number,
+             org.apache.sis.converter.StringConverter.Byte,
+             org.apache.sis.converter.StringConverter.Short,
+             org.apache.sis.converter.StringConverter.Integer,
+             org.apache.sis.converter.StringConverter.Long,
+             org.apache.sis.converter.StringConverter.Float,
+             org.apache.sis.converter.StringConverter.Double,
+             org.apache.sis.converter.StringConverter.BigInteger,
+             org.apache.sis.converter.StringConverter.BigDecimal,
+             org.apache.sis.converter.StringConverter.Boolean,
+             org.apache.sis.converter.StringConverter.Locale,
+             org.apache.sis.converter.StringConverter.Charset,
+             org.apache.sis.converter.StringConverter.InternationalString,
+             org.apache.sis.converter.StringConverter.File,
+             org.apache.sis.converter.StringConverter.Path,
+             org.apache.sis.converter.StringConverter.URI,
+             org.apache.sis.converter.StringConverter.URL,
+             org.apache.sis.converter.StringConverter.Unit,
+             org.apache.sis.converter.StringConverter.Angle,
+             org.apache.sis.converter.AngleConverter,
+             org.apache.sis.converter.AngleConverter.Inverse,
+             org.apache.sis.converter.PathConverter.FilePath,
+             org.apache.sis.converter.PathConverter.URLPath,
+             org.apache.sis.converter.PathConverter.URIPath,
+             org.apache.sis.converter.PathConverter.PathURI,
+             org.apache.sis.converter.PathConverter.PathURL,
+             org.apache.sis.converter.PathConverter.PathFile,
+             org.apache.sis.converter.PathConverter.FileURI,
+             org.apache.sis.converter.PathConverter.FileURL,
+             org.apache.sis.converter.PathConverter.URLFile,
+             org.apache.sis.converter.PathConverter.URIFile,
+             org.apache.sis.converter.PathConverter.URL_URI,
+             org.apache.sis.converter.PathConverter.URI_URL,
+             org.apache.sis.converter.DateConverter.Long,
+             org.apache.sis.converter.DateConverter.SQL,
+             org.apache.sis.converter.DateConverter.Timestamp,
+             org.apache.sis.converter.CollectionConverter.List,
+             org.apache.sis.converter.CollectionConverter.Set,
+             org.apache.sis.converter.FractionConverter,
+             org.apache.sis.converter.FractionConverter.FromInteger;
 
     uses org.apache.sis.util.ObjectConverter;
     uses org.apache.sis.setup.InstallationResources;
-    uses org.apache.sis.internal.util.MetadataServices;
+    uses org.apache.sis.util.internal.MetadataServices;
 
     exports org.apache.sis.io;
     exports org.apache.sis.math;
@@ -114,7 +114,7 @@ module org.apache.sis.util {
             org.apache.sis.openoffice,
             org.apache.sis.gui;                         // In the "optional" sub-project.
 
-    exports org.apache.sis.internal.util to
+    exports org.apache.sis.util.internal to
             org.apache.sis.metadata,
             org.apache.sis.referencing,
             org.apache.sis.referencing.gazetteer,
@@ -131,16 +131,16 @@ module org.apache.sis.util {
             org.apache.sis.console,
             org.apache.sis.gui;                         // In the "optional" sub-project.
 
-    exports org.apache.sis.internal.temporal to
+    exports org.apache.sis.pending.temporal to
             org.apache.sis.metadata;
 
-    exports org.apache.sis.internal.converter to
+    exports org.apache.sis.converter to
             org.apache.sis.metadata,
             org.apache.sis.referencing,
             org.apache.sis.feature,
             org.apache.sis.storage;
 
-    exports org.apache.sis.internal.system to
+    exports org.apache.sis.system to
             org.apache.sis.metadata,
             org.apache.sis.referencing,
             org.apache.sis.referencing.gazetteer,
@@ -157,7 +157,7 @@ module org.apache.sis.util {
             org.apache.sis.webapp,                      // In the "incubator" sub-project.
             org.apache.sis.gui;                         // In the "optional" sub-project.
 
-    exports org.apache.sis.internal.jdk17 to
+    exports org.apache.sis.pending.jdk to
             org.apache.sis.feature,
             org.apache.sis.storage,
             org.apache.sis.storage.sql,
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/AngleConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/AngleConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/AngleConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/AngleConverter.java
index 7338c69d02..fb43fb4dd7 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/AngleConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/AngleConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import org.apache.sis.measure.Angle;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ArrayConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ArrayConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ArrayConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ArrayConverter.java
index 5dd3721df8..a9c0637963 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ArrayConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ArrayConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/CharSequenceConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/CharSequenceConverter.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/CharSequenceConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/CharSequenceConverter.java
index 33038aa760..d7ffbf83c5 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/CharSequenceConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/CharSequenceConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ClassPair.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ClassPair.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ClassPair.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ClassPair.java
index d196b1e065..66df6d8ef7 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ClassPair.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ClassPair.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.io.Serializable;
 import org.apache.sis.util.ObjectConverter;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/CollectionConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/CollectionConverter.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/CollectionConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/CollectionConverter.java
index 41604dcf16..c286a11e39 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/CollectionConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/CollectionConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Collection;
 import java.util.ArrayList;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/Column.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/Column.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/Column.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/Column.java
index 2b08a31075..094d6f59a4 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/Column.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/Column.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.io.Serializable;
 import java.io.ObjectStreamException;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ConverterRegistry.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ConverterRegistry.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ConverterRegistry.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ConverterRegistry.java
index 7af788e701..2ff9eb5914 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ConverterRegistry.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ConverterRegistry.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Map;
 import java.util.LinkedHashMap;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/DateConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/DateConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/DateConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/DateConverter.java
index 3391ab0774..fd638a84f9 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/DateConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/DateConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Date;
 import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/FallbackConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/FallbackConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/FallbackConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/FallbackConverter.java
index 23f869a289..81f34d0dca 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/FallbackConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/FallbackConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Arrays;
 import java.util.Set;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/FractionConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/FractionConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/FractionConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/FractionConverter.java
index 37f54ac39f..1fef737830 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/FractionConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/FractionConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import org.apache.sis.math.Fraction;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/IdentityConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/IdentityConverter.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/IdentityConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/IdentityConverter.java
index f73d835ec1..3fbf977eca 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/IdentityConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/IdentityConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/NumberConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/NumberConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/NumberConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/NumberConverter.java
index 9ce7184428..a782d3759d 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/NumberConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/NumberConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ObjectToString.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ObjectToString.java
similarity index 96%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ObjectToString.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ObjectToString.java
index a90e32c009..e8e08d19d8 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/ObjectToString.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/ObjectToString.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
@@ -113,7 +113,7 @@ class ObjectToString<S> extends SystemConverter<S,String> {
      * Specialized instance for {@link org.opengis.util.CodeList}.
      * This class invokes {@link org.opengis.util.CodeList#name()} instead of {@code toString()}.
      *
-     * @see org.apache.sis.internal.converter.StringConverter.CodeList
+     * @see org.apache.sis.converter.StringConverter.CodeList
      */
     static final class CodeList<S extends org.opengis.util.CodeList<S>> extends ObjectToString<S> {
         private static final long serialVersionUID = 1454105232343463228L;
@@ -140,7 +140,7 @@ class ObjectToString<S> extends SystemConverter<S,String> {
      * Specialized instance for {@link java.lang.Enum}.
      * This class invokes {@link java.lang.Enum#name()} instead of {@code toString()}.
      *
-     * @see org.apache.sis.internal.converter.StringConverter.Enum
+     * @see org.apache.sis.converter.StringConverter.Enum
      */
     static final class Enum<S extends java.lang.Enum<S>> extends ObjectToString<S> {
         private static final long serialVersionUID = 5391817175838307542L;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/PathConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/PathConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/PathConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/PathConverter.java
index f347bf61f9..88f218e830 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/PathConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/PathConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/StringConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/StringConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/StringConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/StringConverter.java
index 9f1cf6196b..61f65b7682 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/StringConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/StringConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
@@ -30,8 +30,8 @@ import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ObjectConverter;
 import org.apache.sis.util.UnconvertibleObjectException;
 import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.internal.util.CodeLists;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.CodeLists;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.measure.Units;
 
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SurjectiveConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SurjectiveConverter.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SurjectiveConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SurjectiveConverter.java
index 686103a562..00df260dab 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SurjectiveConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SurjectiveConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SystemConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemConverter.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SystemConverter.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemConverter.java
index cd17838deb..173880c48d 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SystemConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemConverter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Set;
 import java.util.EnumSet;
@@ -25,7 +25,7 @@ import org.apache.sis.util.resources.Errors;
 
 
 /**
- * Base class of all converters defined in the {@code org.apache.sis.internal} package.
+ * Base class of all converters defined in the {@code org.apache.sis.converter} package.
  * Those converters are returned by system-wide {@link ConverterRegistry}, and cached for reuse.
  *
  * <h2>Immutability and thread safety</h2>
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SystemRegistry.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemRegistry.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SystemRegistry.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemRegistry.java
index f2e17e5b8f..91c7eb14f8 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/SystemRegistry.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/SystemRegistry.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
 
 import java.util.Date;
 import java.util.ServiceLoader;
@@ -22,9 +22,9 @@ import org.opengis.util.CodeList;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ObjectConverter;
 import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.internal.system.SystemListener;
-import org.apache.sis.internal.system.Reflect;
-import org.apache.sis.internal.system.Modules;
+import org.apache.sis.system.SystemListener;
+import org.apache.sis.system.Reflect;
+import org.apache.sis.system.Modules;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/package-info.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/package-info.java
similarity index 90%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/package-info.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/package-info.java
index 79ec94ecf7..f50c64d819 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/converter/package-info.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/converter/package-info.java
@@ -18,9 +18,9 @@
 /**
  * Default set of {@link org.apache.sis.util.ObjectConverter} implementations.
  * Converter for a given pair of <cite>source</cite> and <cite>target</cite> classes
- * can be obtained with {@link org.apache.sis.internal.converter.ConverterRegistry}.
+ * can be obtained with {@link org.apache.sis.converter.ConverterRegistry}.
  * A system-wide instance of {@code ConverterRegistry} with a default set of conversions
- * is available as {@link org.apache.sis.internal.converter.SystemRegistry#INSTANCE}.
+ * is available as {@link org.apache.sis.converter.SystemRegistry#INSTANCE}.
  *
  * <h2>Adding system-wide converters</h2>
  * Applications can add system-wide custom converters either by explicit calls to the
@@ -40,4 +40,4 @@
  * @version 1.4
  * @since   0.3
  */
-package org.apache.sis.internal.converter;
+package org.apache.sis.converter;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/system/Descriptions_fr.properties b/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/system/Descriptions_fr.properties
deleted file mode 100644
index 8a72bcee61..0000000000
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/system/Descriptions_fr.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements;
-# and to You under the Apache License, Version 2.0.
-supervisor=Fournit des informations � propos de l\u2019�tat d\u2019une biblioth�que Apache SIS en cours d\u2019ex�cution.
-org.apache.sis.internal.system.Supervisor=Construit un nouveau superviseur.
-locale=La langue des messages produits par le superviseur.
-configuration=Arborescence d'information concernant l\u2019environnement d\u2019ex�cution de Apache SIS.
-warnings=Liste des probl�mes d�tect�s dans la biblioth�que Apache SIS en cours d\u2019ex�cution. Si cette liste contient des items, alors un red�marrage de l\u2019application est fortement recommand�.
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/CompoundFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/CompoundFormat.java
index d4b29d4444..9ab94ef616 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/CompoundFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/CompoundFormat.java
@@ -46,10 +46,10 @@ import org.apache.sis.util.Classes;
 import org.apache.sis.util.Localized;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.MetadataServices;
-import org.apache.sis.internal.util.LocalizedParseException;
+import org.apache.sis.util.internal.MetadataServices;
+import org.apache.sis.util.internal.LocalizedParseException;
 
-import static org.apache.sis.internal.util.StandardDateFormat.UTC;
+import static org.apache.sis.util.internal.StandardDateFormat.UTC;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/DefaultFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/DefaultFormat.java
index eef4e4f51e..a7d94cedbc 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/DefaultFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/DefaultFormat.java
@@ -23,7 +23,7 @@ import java.text.ParseException;
 import java.io.ObjectStreamException;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.CharSequences;
-import org.apache.sis.internal.util.LocalizedParseException;
+import org.apache.sis.util.internal.LocalizedParseException;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IdentifiedObjectFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IdentifiedObjectFormat.java
index fdff3ca7a0..cc27143499 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IdentifiedObjectFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/IdentifiedObjectFormat.java
@@ -24,8 +24,8 @@ import org.opengis.util.GenericName;
 import org.opengis.metadata.Identifier;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.MetadataServices;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.MetadataServices;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/LineAppender.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/LineAppender.java
index c25e2c4f9c..f63c785b04 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/LineAppender.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/LineAppender.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java
index 14d6f80100..b99e2c3c64 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/io/TableAppender.java
@@ -27,7 +27,7 @@ import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.StringBuilders;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.X364;
+import org.apache.sis.util.internal.X364;
 
 import static org.apache.sis.util.Characters.isLineOrParagraphSeparator;
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/ArrayVector.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/ArrayVector.java
index a285d44643..ae30c793cd 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/ArrayVector.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/ArrayVector.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.Numbers;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.CheckedContainer;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.measure.NumberRange;
 
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java
index d8d7e68dff..8a35e7983d 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/DecimalFunctions.java
@@ -19,9 +19,9 @@ package org.apache.sis.math;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
-import static org.apache.sis.internal.util.Numerics.SIGNIFICAND_SIZE;
+import static org.apache.sis.util.internal.Numerics.SIGNIFICAND_SIZE;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Fraction.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Fraction.java
index 3b1ded1fb7..9435f7f7ab 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Fraction.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Fraction.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.collection.WeakHashSet;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java
index 8b0dc78157..b0fd7c4f55 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.util.function.DoubleUnaryOperator;
 import org.opengis.geometry.DirectPosition;
 import org.opengis.geometry.MismatchedDimensionException;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/LinearlyDerivedVector.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/LinearlyDerivedVector.java
index 15142ca79e..c72f6b24fd 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/LinearlyDerivedVector.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/LinearlyDerivedVector.java
@@ -20,7 +20,7 @@ import java.util.Objects;
 import java.io.Serializable;
 import java.util.function.IntSupplier;
 import org.apache.sis.util.Numbers;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.measure.NumberRange;
 
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java
index 02a409c481..dda7235cd8 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/MathFunctions.java
@@ -21,7 +21,7 @@ import org.apache.sis.util.Static;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.DoubleDouble;
 
 import static java.lang.Math.PI;
 import static java.lang.Math.min;
@@ -39,8 +39,8 @@ import static java.lang.Float.floatToRawIntBits;
 import static java.lang.Double.longBitsToDouble;
 import static java.lang.Double.doubleToLongBits;
 import static java.lang.Double.doubleToRawLongBits;
-import static org.apache.sis.internal.util.Numerics.SIGN_BIT_MASK;
-import static org.apache.sis.internal.util.Numerics.SIGNIFICAND_SIZE;
+import static org.apache.sis.util.internal.Numerics.SIGN_BIT_MASK;
+import static org.apache.sis.util.internal.Numerics.SIGNIFICAND_SIZE;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java
index 1450f67eae..38de7e4125 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java
@@ -21,9 +21,9 @@ import java.io.Serializable;
 import java.util.function.DoubleBinaryOperator;
 import org.opengis.geometry.DirectPosition;
 import org.opengis.geometry.MismatchedDimensionException;
-import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java
index 9a792fb0aa..198b22ced7 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Statistics.java
@@ -24,8 +24,8 @@ import org.opengis.util.InternationalString;
 import org.apache.sis.util.SimpleInternationalString;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.DoubleDouble;
 
 import static java.lang.Math.*;
 import static java.lang.Double.NaN;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/StatisticsFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/StatisticsFormat.java
index afdbe28a10..4a739e9487 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/StatisticsFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/StatisticsFormat.java
@@ -34,7 +34,7 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.collection.BackingStoreException;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java
index 3ccd710488..b72e4ff5b3 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Vector.java
@@ -30,8 +30,8 @@ import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.system.Loggers;
 
 import static java.util.logging.Logger.getLogger;
 import static org.apache.sis.util.ArgumentChecks.ensureValidIndex;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AbstractUnit.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AbstractUnit.java
index 17206ceebb..914f309925 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AbstractUnit.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AbstractUnit.java
@@ -33,8 +33,8 @@ import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.logging.Logging;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.system.Configuration;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.system.Configuration;
 
 
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Angle.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Angle.java
index f1b9be4b28..afe5a64609 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Angle.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Angle.java
@@ -30,7 +30,7 @@ import org.opengis.referencing.cs.AxisDirection;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.internal.util.Strings;
+import org.apache.sis.util.internal.Strings;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Classes;
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AngleFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AngleFormat.java
index f8b5843215..b244dd02fe 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AngleFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/AngleFormat.java
@@ -30,8 +30,8 @@ import java.text.AttributedCharacterIterator;
 import org.apache.sis.util.Localized;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.LocalizedParseException;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.LocalizedParseException;
 
 import static java.lang.Double.NaN;
 import static java.lang.Double.isNaN;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/FormattedCharacterIterator.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/FormattedCharacterIterator.java
index 85c8fe3528..5ec7868a7a 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/FormattedCharacterIterator.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/FormattedCharacterIterator.java
@@ -26,8 +26,8 @@ import java.text.Format;
 import java.text.AttributedCharacterIterator;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.collection.Containers;
-import org.apache.sis.internal.converter.SurjectiveConverter;
-import org.apache.sis.internal.util.SimpleCharacterIterator;
+import org.apache.sis.converter.SurjectiveConverter;
+import org.apache.sis.util.internal.SimpleCharacterIterator;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/LinearConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/LinearConverter.java
index 046be4852e..c16814d4bf 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/LinearConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/LinearConverter.java
@@ -25,8 +25,8 @@ import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.math.MathFunctions;
 import org.apache.sis.math.Fraction;
-import org.apache.sis.internal.util.Numerics;
-import org.apache.sis.internal.util.DoubleDouble;
+import org.apache.sis.util.internal.Numerics;
+import org.apache.sis.util.internal.DoubleDouble;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/NumberRange.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/NumberRange.java
index 2de465e402..8edc6ef8db 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/NumberRange.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/NumberRange.java
@@ -19,7 +19,7 @@ package org.apache.sis.measure;
 import java.util.Objects;
 import org.apache.sis.util.Numbers;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.MathFunctions;
 import org.apache.sis.util.collection.WeakHashSet;
 import org.opengis.referencing.operation.MathTransform1D;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Prefixes.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Prefixes.java
index fb10c9533a..b4c9d4cee8 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Prefixes.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Prefixes.java
@@ -20,7 +20,7 @@ import java.util.Arrays;
 import javax.measure.Unit;
 import javax.measure.Quantity;
 import javax.measure.UnitConverter;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.MathFunctions;
 
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Range.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Range.java
index ffe769cf1b..bb720b5c55 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Range.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Range.java
@@ -22,8 +22,8 @@ import java.util.Formattable;
 import java.util.FormattableFlags;
 import java.io.Serializable;
 import javax.measure.Unit;
-import org.apache.sis.internal.util.Strings;
-import org.apache.sis.internal.util.ArgumentCheckByAssertion;
+import org.apache.sis.util.internal.Strings;
+import org.apache.sis.util.internal.ArgumentCheckByAssertion;
 import org.apache.sis.util.collection.CheckedContainer;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Emptiable;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java
index 233402c612..289493bada 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/RangeFormat.java
@@ -42,9 +42,9 @@ import org.apache.sis.util.Localized;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.UnconvertibleObjectException;
-import org.apache.sis.internal.util.LocalizedParseException;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.LocalizedParseException;
+import org.apache.sis.util.internal.StandardDateFormat;
+import org.apache.sis.util.internal.Numerics;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Scalar.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Scalar.java
index 65755e65f4..f64177132c 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Scalar.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Scalar.java
@@ -23,7 +23,7 @@ import javax.measure.UnitConverter;
 import javax.measure.UnconvertibleException;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.StringBuilders;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.util.logging.Logging;
 
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SexagesimalConverter.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SexagesimalConverter.java
index 4385b1c4f0..64a96331af 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SexagesimalConverter.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SexagesimalConverter.java
@@ -20,7 +20,7 @@ import javax.measure.Unit;
 import javax.measure.quantity.Angle;
 import javax.measure.UnitConverter;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Numerics;
+import org.apache.sis.util.internal.Numerics;
 import org.apache.sis.math.MathFunctions;
 
 import static org.apache.sis.math.MathFunctions.truncate;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SystemUnit.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SystemUnit.java
index 5b90beefd3..a1c7b3be77 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SystemUnit.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/SystemUnit.java
@@ -32,7 +32,7 @@ import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ObjectConverters;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.converter.SurjectiveConverter;
+import org.apache.sis.converter.SurjectiveConverter;
 import org.apache.sis.math.Fraction;
 
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitDimension.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitDimension.java
index 7b861a7527..999b6e3939 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitDimension.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitDimension.java
@@ -28,8 +28,8 @@ import org.apache.sis.math.Fraction;
 import org.apache.sis.util.ObjectConverters;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.UnsupportedImplementationException;
-import org.apache.sis.internal.converter.FractionConverter;
-import org.apache.sis.internal.util.CollectionsExt;
+import org.apache.sis.converter.FractionConverter;
+import org.apache.sis.util.internal.CollectionsExt;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java
index f5a4337175..3496f1e074 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java
@@ -34,9 +34,9 @@ import java.lang.reflect.InaccessibleObjectException;
 import javax.measure.Dimension;
 import javax.measure.Unit;
 import javax.measure.format.MeasurementParseException;
-import org.apache.sis.internal.system.Configuration;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.DefinitionURI;
+import org.apache.sis.system.Configuration;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.util.internal.DefinitionURI;
 import org.apache.sis.math.Fraction;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.math.MathFunctions;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitServices.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitServices.java
index 5d01627a96..265689ee6c 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitServices.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitServices.java
@@ -30,7 +30,7 @@ import javax.measure.spi.ServiceProvider;
 import javax.measure.spi.SystemOfUnits;
 import javax.measure.spi.SystemOfUnitsService;
 import javax.measure.spi.FormatService;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.CharSequences;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java
index f1e99147d4..89749de380 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/Units.java
@@ -29,7 +29,7 @@ import org.opengis.referencing.cs.AxisDirection;    // For javadoc
 import org.apache.sis.util.Static;
 import org.apache.sis.util.OptionalCandidate;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.internal.util.Constants;
+import org.apache.sis.util.internal.Constants;
 
 import static org.apache.sis.measure.UnitRegistry.SI;
 import static org.apache.sis.measure.UnitRegistry.ACCEPTED;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/HexFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/HexFormat.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/HexFormat.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/HexFormat.java
index 73d823b230..dcfbe9ce82 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/HexFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/HexFormat.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jdk17;
+package org.apache.sis.pending.jdk;
 
 import org.apache.sis.util.resources.Errors;
 
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/JDK17.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/JDK17.java
similarity index 97%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/JDK17.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/JDK17.java
index ffc1bb6813..bd84a60ae1 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/JDK17.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/JDK17.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jdk17;
+package org.apache.sis.pending.jdk;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.stream.Stream;
-import org.apache.sis.internal.util.UnmodifiableArrayList;
+import org.apache.sis.util.internal.UnmodifiableArrayList;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/Record.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/Record.java
similarity index 96%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/Record.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/Record.java
index ba5613e381..a9a63c7dac 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/Record.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/Record.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.jdk17;
+package org.apache.sis.pending.jdk;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/package-info.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/package-info.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/package-info.java
index dc41120d1e..d0530d3981 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/jdk17/package-info.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/jdk/package-info.java
@@ -27,4 +27,4 @@
  * @since   1.4
  * @version 0.8
  */
-package org.apache.sis.internal.jdk17;
+package org.apache.sis.pending.jdk;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultInstant.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultInstant.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultInstant.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultInstant.java
index fe6e74cab6..793ee0b9ba 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultInstant.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultInstant.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.temporal;
+package org.apache.sis.pending.temporal;
 
 import java.util.Date;
 import org.opengis.temporal.Instant;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultPeriod.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultPeriod.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultPeriod.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultPeriod.java
index 4b807b475e..d998db3b7f 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultPeriod.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultPeriod.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.temporal;
+package org.apache.sis.pending.temporal;
 
 import java.util.Objects;
 import org.opengis.temporal.Instant;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultPeriodDuration.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultPeriodDuration.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java
index 15ace94af4..398bc66089 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultPeriodDuration.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.temporal;
+package org.apache.sis.pending.temporal;
 
 import java.util.Objects;
 import org.opengis.temporal.PeriodDuration;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultTemporalFactory.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultTemporalFactory.java
similarity index 99%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultTemporalFactory.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultTemporalFactory.java
index 11dcb68ead..f3ee512445 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/DefaultTemporalFactory.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/DefaultTemporalFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.temporal;
+package org.apache.sis.pending.temporal;
 
 import java.util.Date;
 import java.util.Collection;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/Primitive.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/Primitive.java
similarity index 98%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/Primitive.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/Primitive.java
index f84dc54add..1674883ad4 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/Primitive.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/Primitive.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.temporal;
+package org.apache.sis.pending.temporal;
 
 import org.opengis.metadata.Identifier;
 import org.opengis.temporal.Duration;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/package-info.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/package-info.java
similarity index 96%
rename from endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/package-info.java
rename to endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/package-info.java
index e616a33332..dd970ce080 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/internal/temporal/package-info.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/pending/temporal/package-info.java
@@ -23,4 +23,4 @@
  * @version 1.4
  * @since   1.2
  */
-package org.apache.sis.internal.temporal;
+package org.apache.sis.pending.temporal;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
index 9391002ea3..c386225d72 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/About.java
@@ -50,18 +50,18 @@ import org.apache.sis.util.resources.Vocabulary;
 import org.apache.sis.util.collection.TreeTable;
 import org.apache.sis.util.collection.TreeTables;
 import org.apache.sis.util.collection.DefaultTreeTable;
-import org.apache.sis.internal.util.MetadataServices;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.system.Loggers;
-import org.apache.sis.internal.system.Modules;
-import org.apache.sis.internal.system.Shutdown;
-import org.apache.sis.internal.system.DataDirectory;
+import org.apache.sis.util.internal.MetadataServices;
+import org.apache.sis.util.internal.Constants;
+import org.apache.sis.system.Loggers;
+import org.apache.sis.system.Modules;
+import org.apache.sis.system.Shutdown;
+import org.apache.sis.system.DataDirectory;
 
 import static java.lang.System.getProperty;
 import static java.util.logging.Logger.getLogger;
 import static org.apache.sis.util.collection.TableColumn.NAME;
 import static org.apache.sis.util.collection.TableColumn.VALUE_AS_TEXT;
-import static org.apache.sis.internal.util.StandardDateFormat.UTC;
+import static org.apache.sis.util.internal.StandardDateFormat.UTC;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java
index 7619eeaf6a..5666a10570 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java
@@ -23,7 +23,7 @@ import java.sql.SQLException;
 import java.util.function.Supplier;
 import java.util.concurrent.TimeUnit;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.internal.util.MetadataServices;
+import org.apache.sis.util.internal.MetadataServices;
 
 
 /**
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/InstallationResources.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/InstallationResources.java
index 91eac17e0a..79475a7141 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/InstallationResources.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/InstallationResources.java
@@ -21,10 +21,10 @@ import java.util.Locale;
 import java.util.ServiceLoader;
 import java.io.IOException;
 import java.io.BufferedReader;
-import org.apache.sis.internal.util.URLs;
-import org.apache.sis.internal.util.Constants;
-import org.apache.sis.internal.util.MetadataServices;
-import org.apache.sis.internal.system.Reflect;
+import org.apache.sis.util.internal.URLs;
... 2442 lines suppressed ...