[sis] 13/23: Rename the internal packages of the `org.apache.sis.storage` module (stores only). Since they are not exported, the `internal` name convention is not needed anymore.

[desruisseaux]

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 22639152a160ee6d5369afffc9b773f55963f5aa
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Aug 21 13:07:08 2023 +0200

    Rename the internal packages of the `org.apache.sis.storage` module (stores 
only).
    Since they are not exported, the `internal` name convention is not needed 
anymore.
---
 .../apache/sis/storage/landsat/LandsatStore.java    |   2 +-
 .../sis/storage/landsat/LandsatStoreProvider.java   |   2 +-
 .../apache/sis/storage/netcdf/MetadataReader.java   |   2 +-
 .../main/org/apache/sis/storage/gpx/Bounds.java     |   2 +-
 .../storage/xml/stream/StaxDataStoreProvider.java   |   2 +-
 .../org.apache.sis.storage.DataStoreProvider        |  14 +++++++-------
 .../org.apache.sis.storage/main/module-info.java    |  20 ++++++++++----------
 .../apache/sis/internal/storage/PRJDataStore.java   |   2 +-
 .../org/apache/sis/storage/StorageConnector.java    |   2 +-
 .../{internal => }/storage/csv/FeatureIterator.java |   2 +-
 .../{internal => }/storage/csv/FixedSizeList.java   |   2 +-
 .../sis/{internal => }/storage/csv/Foliation.java   |   2 +-
 .../{internal => }/storage/csv/GeometryParser.java  |   2 +-
 .../storage/csv/MovingFeatureBuilder.java           |   2 +-
 .../storage/csv/MovingFeatureIterator.java          |   2 +-
 .../sis/{internal => }/storage/csv/Store.java       |   2 +-
 .../{internal => }/storage/csv/StoreProvider.java   |   4 ++--
 .../{internal => }/storage/csv/TimeEncoding.java    |   2 +-
 .../{internal => }/storage/csv/package-info.java    |   2 +-
 .../{internal => }/storage/esri/AsciiGridStore.java |   2 +-
 .../storage/esri/AsciiGridStoreProvider.java        |   2 +-
 .../{internal => }/storage/esri/CharactersView.java |   2 +-
 .../{internal => }/storage/esri/RasterStore.java    |   2 +-
 .../storage/esri/RawRasterLayout.java               |   2 +-
 .../storage/esri/RawRasterReader.java               |   2 +-
 .../{internal => }/storage/esri/RawRasterStore.java |   2 +-
 .../storage/esri/RawRasterStoreProvider.java        |   2 +-
 .../{internal => }/storage/esri/WritableStore.java  |   2 +-
 .../{internal => }/storage/esri/package-info.java   |   2 +-
 .../storage/folder/ConcurrentCloser.java            |   2 +-
 .../sis/{internal => }/storage/folder/Store.java    |   2 +-
 .../storage/folder/StoreProvider.java               |   2 +-
 .../storage/folder/UnstructuredAggregate.java       |   2 +-
 .../storage/folder/WritableStore.java               |   2 +-
 .../{internal => }/storage/folder/package-info.java |   2 +-
 .../{internal => }/storage/image/FormatFilter.java  |   2 +-
 .../{internal => }/storage/image/FormatFinder.java  |   2 +-
 .../storage/image/MultiImageStore.java              |   2 +-
 .../storage/image/SingleImageStore.java             |   2 +-
 .../storage/image/WarningListener.java              |   2 +-
 .../storage/image/WorldFileResource.java            |   2 +-
 .../storage/image/WorldFileStore.java               |   2 +-
 .../storage/image/WorldFileStoreProvider.java       |   2 +-
 .../storage/image/WritableResource.java             |   2 +-
 .../storage/image/WritableSingleImageStore.java     |   2 +-
 .../{internal => }/storage/image/WritableStore.java |   2 +-
 .../{internal => }/storage/image/package-info.java  |   2 +-
 .../storage/wkt/FirstKeywordPeek.java               |   2 +-
 .../sis/{internal => }/storage/wkt/Store.java       |   2 +-
 .../sis/{internal => }/storage/wkt/StoreFormat.java |   2 +-
 .../{internal => }/storage/wkt/StoreProvider.java   |   2 +-
 .../{internal => }/storage/wkt/package-info.java    |   2 +-
 .../storage/xml/AbstractProvider.java               |   2 +-
 .../storage/xml/GeographicEnvelope.java             |   2 +-
 .../storage/xml/MimeTypeDetector.java               |   2 +-
 .../sis/{internal => }/storage/xml/Store.java       |   2 +-
 .../{internal => }/storage/xml/StoreProvider.java   |   2 +-
 .../{internal => }/storage/xml/package-info.java    |   9 +++++++--
 .../test/org/apache/sis/storage/DataStoresTest.java |   2 +-
 .../storage/csv/StoreProviderTest.java              |   2 +-
 .../sis/{internal => }/storage/csv/StoreTest.java   |   2 +-
 .../storage/esri/AsciiGridStoreTest.java            |   2 +-
 .../apache/sis/{internal => }/storage/esri/BIL.hdr  |   0
 .../apache/sis/{internal => }/storage/esri/BIL.raw  | Bin
 .../storage/esri/BILConsistencyTest.java            |   2 +-
 .../apache/sis/{internal => }/storage/esri/BIP.hdr  |   0
 .../apache/sis/{internal => }/storage/esri/BIP.raw  | Bin
 .../apache/sis/{internal => }/storage/esri/BIP.stx  |   0
 .../storage/esri/BIPConsistencyTest.java            |   2 +-
 .../apache/sis/{internal => }/storage/esri/BSQ.hdr  |   0
 .../apache/sis/{internal => }/storage/esri/BSQ.raw  | Bin
 .../storage/esri/BSQConsistencyTest.java            |   2 +-
 .../storage/esri/WritableStoreTest.java             |   2 +-
 .../apache/sis/{internal => }/storage/esri/grid.asc |   0
 .../apache/sis/{internal => }/storage/esri/grid.clr |   0
 .../apache/sis/{internal => }/storage/esri/grid.prj |   0
 .../{internal => }/storage/folder/StoreTest.java    |   2 +-
 .../storage/folder/test-data/README.txt             |   0
 .../{internal => }/storage/folder/test-data/crs.prj |   0
 .../storage/folder/test-data/data1.xml              |   0
 .../storage/folder/test-data/data2.xml              |   0
 .../storage/folder/test-data/data3.xml              |   0
 .../storage/folder/test-data/data4/data5.xml        |   0
 .../sis/{internal => }/storage/image/README.md      |   0
 .../storage/image/SelfConsistencyTest.java          |   2 +-
 .../storage/image/WorldFileStoreTest.java           |   2 +-
 .../sis/{internal => }/storage/image/gradient.pgw   |   0
 .../sis/{internal => }/storage/image/gradient.png   | Bin
 .../sis/{internal => }/storage/image/gradient.prj   |   0
 .../storage/wkt/StoreProviderTest.java              |   2 +-
 .../sis/{internal => }/storage/wkt/StoreTest.java   |   2 +-
 .../storage/xml/MimeTypeDetectorTest.java           |   2 +-
 .../storage/xml/StoreProviderTest.java              |   2 +-
 .../sis/{internal => }/storage/xml/StoreTest.java   |   2 +-
 .../main/org/apache/sis/gui/DataViewer.java         |   4 ++--
 .../org/apache/sis/gui/dataset/ResourceItem.java    |   2 +-
 .../org/apache/sis/gui/dataset/TreeViewType.java    |   2 +-
 .../org/apache/sis/gui/internal/DataFormats.java    |   2 +-
 .../apache/sis/gui/internal/DataStoreOpener.java    |   2 +-
 99 files changed, 102 insertions(+), 97 deletions(-)

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 3f63ce93d4..add63b8310 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
@@ -46,7 +46,7 @@ import org.apache.sis.storage.event.StoreEvent;
 import org.apache.sis.storage.event.StoreListener;
 import org.apache.sis.storage.event.WarningEvent;
 import org.apache.sis.internal.storage.URIDataStore;
-import org.apache.sis.internal.storage.folder.ConcurrentCloser;
+import org.apache.sis.storage.folder.ConcurrentCloser;
 import org.apache.sis.internal.util.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/LandsatStoreProvider.java
 
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStoreProvider.java
index 0d847eea11..002d55a1c6 100644
--- 
a/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage.earthobservation/main/org/apache/sis/storage/landsat/LandsatStoreProvider.java
@@ -30,7 +30,7 @@ import org.apache.sis.storage.ProbeResult;
 import org.apache.sis.internal.storage.Capability;
 import org.apache.sis.internal.storage.StoreMetadata;
 import org.apache.sis.internal.storage.URIDataStore;
-import org.apache.sis.internal.storage.wkt.FirstKeywordPeek;
+import org.apache.sis.storage.wkt.FirstKeywordPeek;
 
 
 /**
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 b758c2dc7a..9372dba141 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
@@ -63,7 +63,7 @@ import org.apache.sis.storage.netcdf.base.Dimension;
 import org.apache.sis.storage.netcdf.base.Grid;
 import org.apache.sis.internal.storage.io.IOUtilities;
 import org.apache.sis.internal.storage.MetadataBuilder;
-import org.apache.sis.internal.storage.wkt.StoreFormat;
+import org.apache.sis.storage.wkt.StoreFormat;
 import org.apache.sis.internal.referencing.AxisDirections;
 import org.apache.sis.internal.system.Configuration;
 import org.apache.sis.internal.util.CollectionsExt;
diff --git 
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Bounds.java
 
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Bounds.java
index 49b8b90889..537eff13d2 100644
--- 
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Bounds.java
+++ 
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/gpx/Bounds.java
@@ -18,7 +18,7 @@ package org.apache.sis.storage.gpx;
 
 import jakarta.xml.bind.annotation.XmlAttribute;
 import org.opengis.metadata.extent.GeographicBoundingBox;
-import org.apache.sis.internal.storage.xml.GeographicEnvelope;
+import org.apache.sis.storage.xml.GeographicEnvelope;
 
 
 /**
diff --git 
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStoreProvider.java
 
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStoreProvider.java
index 4a06a2a358..2a7d7a7ca3 100644
--- 
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStoreProvider.java
@@ -20,7 +20,7 @@ import java.util.Map;
 import jakarta.xml.bind.JAXBContext;
 import jakarta.xml.bind.JAXBException;
 import org.apache.sis.xml.MarshallerPool;
-import org.apache.sis.internal.storage.xml.AbstractProvider;
+import org.apache.sis.storage.xml.AbstractProvider;
 
 
 /**
diff --git 
a/endorsed/src/org.apache.sis.storage/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
 
b/endorsed/src/org.apache.sis.storage/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
index 66b26bb463..17d8918251 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
+++ 
b/endorsed/src/org.apache.sis.storage/main/META-INF/services/org.apache.sis.storage.DataStoreProvider
@@ -1,10 +1,10 @@
 # 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.storage.image.WorldFileStoreProvider
-org.apache.sis.internal.storage.esri.AsciiGridStoreProvider
-org.apache.sis.internal.storage.esri.RawRasterStoreProvider
-org.apache.sis.internal.storage.csv.StoreProvider
-org.apache.sis.internal.storage.xml.StoreProvider
-org.apache.sis.internal.storage.wkt.StoreProvider
-org.apache.sis.internal.storage.folder.StoreProvider
+org.apache.sis.storage.image.WorldFileStoreProvider
+org.apache.sis.storage.esri.AsciiGridStoreProvider
+org.apache.sis.storage.esri.RawRasterStoreProvider
+org.apache.sis.storage.csv.StoreProvider
+org.apache.sis.storage.xml.StoreProvider
+org.apache.sis.storage.wkt.StoreProvider
+org.apache.sis.storage.folder.StoreProvider
diff --git a/endorsed/src/org.apache.sis.storage/main/module-info.java 
b/endorsed/src/org.apache.sis.storage/main/module-info.java
index cceb6bdff6..60c369e0e1 100644
--- a/endorsed/src/org.apache.sis.storage/main/module-info.java
+++ b/endorsed/src/org.apache.sis.storage/main/module-info.java
@@ -34,13 +34,13 @@ module org.apache.sis.storage {
 
     uses     org.apache.sis.storage.DataStoreProvider;
     provides org.apache.sis.storage.DataStoreProvider
-        with org.apache.sis.internal.storage.image.WorldFileStoreProvider,
-             org.apache.sis.internal.storage.esri.AsciiGridStoreProvider,
-             org.apache.sis.internal.storage.esri.RawRasterStoreProvider,
-             org.apache.sis.internal.storage.csv.StoreProvider,
-             org.apache.sis.internal.storage.xml.StoreProvider,
-             org.apache.sis.internal.storage.wkt.StoreProvider,
-             org.apache.sis.internal.storage.folder.StoreProvider;
+        with org.apache.sis.storage.image.WorldFileStoreProvider,
+             org.apache.sis.storage.esri.AsciiGridStoreProvider,
+             org.apache.sis.storage.esri.RawRasterStoreProvider,
+             org.apache.sis.storage.csv.StoreProvider,
+             org.apache.sis.storage.xml.StoreProvider,
+             org.apache.sis.storage.wkt.StoreProvider,
+             org.apache.sis.storage.folder.StoreProvider;
 
     exports org.apache.sis.storage;
     exports org.apache.sis.storage.event;
@@ -65,16 +65,16 @@ module org.apache.sis.storage {
             org.apache.sis.cloud.aws,
             org.apache.sis.gui;                         // In the "optional" 
sub-project.
 
-    exports org.apache.sis.internal.storage.xml to
+    exports org.apache.sis.storage.xml to
             org.apache.sis.storage.xml,
             org.apache.sis.gui;                         // In the "optional" 
sub-project.
 
-    exports org.apache.sis.internal.storage.wkt to
+    exports org.apache.sis.storage.wkt to
             org.apache.sis.storage.netcdf,
             org.apache.sis.storage.earthobservation,
             org.apache.sis.gui;                         // In the "optional" 
sub-project.
 
-    exports org.apache.sis.internal.storage.folder to
+    exports org.apache.sis.storage.folder to
             org.apache.sis.storage.earthobservation,
             org.apache.sis.gui;                         // In the "optional" 
sub-project.
 }
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/PRJDataStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/PRJDataStore.java
index 699b1b32ac..64c2cb1867 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/PRJDataStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/PRJDataStore.java
@@ -47,7 +47,7 @@ import org.apache.sis.storage.DataStoreContentException;
 import org.apache.sis.storage.DataStoreReferencingException;
 import org.apache.sis.storage.StorageConnector;
 import org.apache.sis.internal.storage.io.IOUtilities;
-import org.apache.sis.internal.storage.wkt.StoreFormat;
+import org.apache.sis.storage.wkt.StoreFormat;
 import org.apache.sis.io.wkt.Convention;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
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 24b225c09a..b3a3f0c7af 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
@@ -1656,7 +1656,7 @@ public class StorageConnector implements Serializable {
      * with cache file, we want to propagate the original exception to user 
because its message
      * may tell that there is no space left on device or no write permission.
      *
-     * @see 
org.apache.sis.internal.storage.image.FormatFinder#unwrap(IIOException)
+     * @see org.apache.sis.storage.image.FormatFinder#unwrap(IIOException)
      */
     @Workaround(library = "JDK", version = "18")
     private static IOException unwrap(final IIOException e) {
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/FeatureIterator.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FeatureIterator.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/FeatureIterator.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FeatureIterator.java
index 379f71686c..1899e9246d 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/FeatureIterator.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FeatureIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.util.Collection;
 import java.util.Spliterator;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/FixedSizeList.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FixedSizeList.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/FixedSizeList.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FixedSizeList.java
index 9a3507a26a..7ae722e80e 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/FixedSizeList.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/FixedSizeList.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.util.AbstractList;
 
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/Foliation.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Foliation.java
similarity index 96%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/Foliation.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Foliation.java
index 4f416a60b8..293b0394bd 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/Foliation.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Foliation.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 
 /**
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/GeometryParser.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/GeometryParser.java
similarity index 97%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/GeometryParser.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/GeometryParser.java
index 67b999e35e..3edeb9eef0 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/GeometryParser.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/GeometryParser.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import org.apache.sis.internal.converter.SurjectiveConverter;
 import org.apache.sis.util.CharSequences;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/MovingFeatureBuilder.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/MovingFeatureBuilder.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
index b1fc08640f..c508679bc4 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/MovingFeatureBuilder.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureBuilder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.util.Date;
 import java.util.Objects;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureIterator.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureIterator.java
index d066762928..832638ac3a 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/MovingFeatureIterator.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/MovingFeatureIterator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.util.Map;
 import java.util.LinkedHashMap;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/Store.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/Store.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
index e87174afc7..1f436821e4 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/Store.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/Store.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.util.List;
 import java.util.ArrayList;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/StoreProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/StoreProvider.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/StoreProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/StoreProvider.java
index 12106897de..490e3c7121 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/StoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/StoreProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.util.logging.Logger;
 import org.opengis.parameter.ParameterValueGroup;
@@ -33,7 +33,7 @@ import org.apache.sis.internal.storage.Resources;
 import org.apache.sis.internal.storage.Capability;
 import org.apache.sis.internal.storage.StoreMetadata;
 import org.apache.sis.internal.storage.URIDataStore;
-import org.apache.sis.internal.storage.wkt.FirstKeywordPeek;
+import org.apache.sis.storage.wkt.FirstKeywordPeek;
 import org.apache.sis.util.ArgumentChecks;
 
 
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/TimeEncoding.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/TimeEncoding.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
index 0e19b389e8..6e84aa1769 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/TimeEncoding.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/TimeEncoding.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.time.Instant;
 import javax.measure.Unit;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/package-info.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/package-info.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/package-info.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/package-info.java
index 4277b0abcd..4170c6e5c5 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/csv/package-info.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/csv/package-info.java
@@ -56,4 +56,4 @@
  * @version 1.4
  * @since   0.7
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/AsciiGridStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/AsciiGridStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStore.java
index 52c9e98c7c..ce85456623 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/AsciiGridStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.util.Map;
 import java.util.List;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/AsciiGridStoreProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStoreProvider.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/AsciiGridStoreProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStoreProvider.java
index c1e5fa9eeb..ed1bb221dc 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/AsciiGridStoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/AsciiGridStoreProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.util.Map;
 import java.util.logging.Logger;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/CharactersView.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/CharactersView.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/CharactersView.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/CharactersView.java
index 91cf755dd9..0cfec56af7 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/CharactersView.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/CharactersView.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RasterStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RasterStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java
index 5226f189f9..36122339fb 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RasterStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.util.List;
 import java.util.Arrays;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterLayout.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterLayout.java
similarity index 96%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterLayout.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterLayout.java
index d329e4b4fc..1988c37ef7 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterLayout.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterLayout.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.awt.image.BandedSampleModel;
 import java.awt.image.PixelInterleavedSampleModel;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterReader.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterReader.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterReader.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterReader.java
index d7aa9b6cc8..a009e542c0 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterReader.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterReader.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.io.IOException;
 import java.nio.Buffer;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStore.java
index 5fd07fae18..f98275b0a2 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.util.List;
 import java.util.Locale;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterStoreProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStoreProvider.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterStoreProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStoreProvider.java
index ea19ec4054..058e995e62 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/RawRasterStoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RawRasterStoreProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.net.URL;
 import java.nio.file.Files;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/WritableStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/WritableStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/WritableStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/WritableStore.java
index b4a2b1e001..8db760b127 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/WritableStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/WritableStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.util.Map;
 import java.util.LinkedHashMap;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/package-info.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/package-info.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/package-info.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/package-info.java
index 4d3e9c6810..0bed97782a 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/esri/package-info.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/package-info.java
@@ -53,4 +53,4 @@
  *
  * @since 1.2
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/ConcurrentCloser.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/ConcurrentCloser.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/ConcurrentCloser.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/ConcurrentCloser.java
index 15e59f86dc..d67e76e8bd 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/ConcurrentCloser.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/ConcurrentCloser.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.folder;
+package org.apache.sis.storage.folder;
 
 import java.util.Collection;
 import java.util.concurrent.Future;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/Store.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/Store.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java
index 08a047c56a..5139e18b58 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/Store.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/Store.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.folder;
+package org.apache.sis.storage.folder;
 
 import java.util.Map;
 import java.util.List;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/StoreProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/StoreProvider.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/StoreProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/StoreProvider.java
index 8f56e6710f..bd2f51139e 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/StoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/StoreProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.folder;
+package org.apache.sis.storage.folder;
 
 import java.util.EnumSet;
 import java.util.Locale;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/UnstructuredAggregate.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/UnstructuredAggregate.java
similarity index 97%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/UnstructuredAggregate.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/UnstructuredAggregate.java
index e8949e2f95..f3a374cb64 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/UnstructuredAggregate.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/UnstructuredAggregate.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.folder;
+package org.apache.sis.storage.folder;
 
 import org.apache.sis.storage.Resource;
 import org.apache.sis.storage.Aggregate;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/WritableStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/WritableStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/WritableStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/WritableStore.java
index 4a0c1a4fa1..9039861da9 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/WritableStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/WritableStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.folder;
+package org.apache.sis.storage.folder;
 
 import java.nio.file.Path;
 import java.nio.file.Files;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/package-info.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/package-info.java
similarity index 95%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/package-info.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/package-info.java
index b5ea37a2e6..981bae18b7 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/folder/package-info.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/folder/package-info.java
@@ -22,4 +22,4 @@
  * @version 1.4
  * @since   0.8
  */
-package org.apache.sis.internal.storage.folder;
+package org.apache.sis.storage.folder;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/FormatFilter.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFilter.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/FormatFilter.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFilter.java
index 8f69dc8847..9986729f95 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/FormatFilter.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFilter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.Map;
 import java.util.Set;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/FormatFinder.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFinder.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/FormatFinder.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFinder.java
index f56e952b4e..4cb5495e7b 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/FormatFinder.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/FormatFinder.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.Map;
 import java.util.LinkedHashMap;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/MultiImageStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/MultiImageStore.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/MultiImageStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/MultiImageStore.java
index b23e633cf0..a7e4108601 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/MultiImageStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/MultiImageStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.io.IOException;
 import org.apache.sis.storage.Aggregate;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/SingleImageStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/SingleImageStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/SingleImageStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/SingleImageStore.java
index 117448ce0d..544621600a 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/SingleImageStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/SingleImageStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.List;
 import java.util.Optional;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WarningListener.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WarningListener.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WarningListener.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WarningListener.java
index ab9f7dbd01..040ceac58f 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WarningListener.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WarningListener.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import javax.imageio.ImageReader;
 import javax.imageio.ImageWriter;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileResource.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileResource.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
index c19ecdb92e..711257c2ae 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileResource.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.List;
 import java.util.Optional;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java
index 948f1a83bb..d8a624f58a 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileStoreProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStoreProvider.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileStoreProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStoreProvider.java
index 3118c5e109..fd0be24e56 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WorldFileStoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WorldFileStoreProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.Set;
 import java.util.HashSet;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableResource.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableResource.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableResource.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableResource.java
index 5d7d398025..43f4b888ae 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableResource.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableResource.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.io.IOException;
 import java.awt.image.RenderedImage;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableSingleImageStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableSingleImageStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableSingleImageStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableSingleImageStore.java
index ef0809470c..8f93e5c445 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableSingleImageStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableSingleImageStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.List;
 import java.util.Optional;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableStore.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableStore.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableStore.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableStore.java
index b1ec9ff290..c6c13c55f5 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/WritableStore.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/WritableStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.util.function.BiConsumer;
 import java.io.IOException;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/package-info.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/package-info.java
similarity index 97%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/package-info.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/package-info.java
index 2a34b3bc34..8950227797 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/image/package-info.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/image/package-info.java
@@ -46,4 +46,4 @@
  *
  * @since 1.2
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/FirstKeywordPeek.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/FirstKeywordPeek.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/FirstKeywordPeek.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/FirstKeywordPeek.java
index 6f32b56631..bdf9af8c96 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/FirstKeywordPeek.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/FirstKeywordPeek.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.wkt;
+package org.apache.sis.storage.wkt;
 
 import java.io.Reader;
 import java.io.IOException;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/Store.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/Store.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/Store.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/Store.java
index 31a77fef26..017b85f95e 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/Store.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/Store.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.wkt;
+package org.apache.sis.storage.wkt;
 
 import java.util.List;
 import java.util.Arrays;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/StoreFormat.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/StoreFormat.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java
index 8945dc262e..2fb35adce6 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/StoreFormat.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreFormat.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.wkt;
+package org.apache.sis.storage.wkt;
 
 import java.text.ParseException;
 import java.util.Locale;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/StoreProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreProvider.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/StoreProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreProvider.java
index 83a2724842..e4a75a2b5d 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/StoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/StoreProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.wkt;
+package org.apache.sis.storage.wkt;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/package-info.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/package-info.java
similarity index 95%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/package-info.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/package-info.java
index 1663565437..9894f2bb85 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/wkt/package-info.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/wkt/package-info.java
@@ -22,4 +22,4 @@
  * @version 1.4
  * @since   0.7
  */
-package org.apache.sis.internal.storage.wkt;
+package org.apache.sis.storage.wkt;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/AbstractProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/AbstractProvider.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/AbstractProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/AbstractProvider.java
index d59da9b40b..73977acd38 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/AbstractProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/AbstractProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.util.Map;
 import java.io.Reader;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/GeographicEnvelope.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/GeographicEnvelope.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/GeographicEnvelope.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/GeographicEnvelope.java
index 53ba7e3f74..7d23d6438b 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/GeographicEnvelope.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/GeographicEnvelope.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/MimeTypeDetector.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/MimeTypeDetector.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/MimeTypeDetector.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/MimeTypeDetector.java
index 9681af005f..cc620c1cd3 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/MimeTypeDetector.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/MimeTypeDetector.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.util.Map;
 import java.util.Arrays;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/Store.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/Store.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
index 381637f81c..ad25bc34ee 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/Store.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/Store.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.util.Map;
 import java.util.logging.Filter;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/StoreProvider.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/StoreProvider.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/StoreProvider.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/StoreProvider.java
index f80e1c848d..c084955ed0 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/StoreProvider.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/StoreProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.util.Map;
 import java.util.logging.Logger;
diff --git 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/package-info.java
 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/package-info.java
similarity index 77%
rename from 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/package-info.java
rename to 
endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/package-info.java
index e51734cf99..2e040e468a 100644
--- 
a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/internal/storage/xml/package-info.java
+++ 
b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/xml/package-info.java
@@ -18,15 +18,20 @@
 /**
  * {@link org.apache.sis.storage.DataStore} implementation for XML files that 
can be (un)marshalled by the
  * {@link org.apache.sis.xml.XML} class. The kinds of objects recognized by 
this package is listed in the
- * {@link org.apache.sis.internal.storage.xml.Store} class.
+ * {@link org.apache.sis.storage.xml.Store} class.
  *
  * <p>This base package is designed for use with JAXB, which allows this 
package to be very small since most of the
  * XML (un)marshalling rules are specified in external classes designed for 
use with JAXB. However, some classes can
  * also be used in other contexts. In particular, the {@code 
org.apache.sis.storage.xml.stream} package in the
  * {@code org.apache.sis.storage.xml} module extends this package with classes 
designed for use with StAX cursor API.</p>
  *
+ * <h2>Design note</h2>
+ * This package is conceptually part of the {@code org.apache.sis.storage.xml} 
module, but is declared in this
+ * base {@code org.apache.sis.storage} module because it provides important 
services at practically no cost.
+ * The actual implementation is provided by the JAXB annotations present in 
metadata and referencing modules.
+ *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 1.4
  * @since   0.4
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/DataStoresTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/DataStoresTest.java
index c3c779215f..4f1e86a68d 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/DataStoresTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/DataStoresTest.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import org.apache.sis.internal.storage.xml.StoreTest;
+import org.apache.sis.storage.xml.StoreTest;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/csv/StoreProviderTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/csv/StoreProviderTest.java
similarity index 97%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/csv/StoreProviderTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/csv/StoreProviderTest.java
index 5aa6d23dc4..68b72fb6fe 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/csv/StoreProviderTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/csv/StoreProviderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import org.apache.sis.setup.OptionKey;
 import org.apache.sis.setup.GeometryLibrary;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/csv/StoreTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/csv/StoreTest.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/csv/StoreTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/csv/StoreTest.java
index 323802ab66..217a41791b 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/csv/StoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/csv/StoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.csv;
+package org.apache.sis.storage.csv;
 
 import java.util.List;
 import java.util.Iterator;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
index f1bf59f19e..6669199bd1 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/AsciiGridStoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/AsciiGridStoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.util.List;
 import java.awt.image.Raster;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIL.hdr
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIL.hdr
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIL.hdr
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIL.hdr
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIL.raw
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIL.raw
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIL.raw
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIL.raw
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BILConsistencyTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BILConsistencyTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java
index b891d7acf2..266f852d2a 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BILConsistencyTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BILConsistencyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.net.URL;
 import java.io.IOException;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIP.hdr
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIP.hdr
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIP.hdr
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIP.hdr
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIP.raw
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIP.raw
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIP.raw
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIP.raw
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIP.stx
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIP.stx
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIP.stx
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIP.stx
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java
index 2ff15d436b..4df7671b03 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BIPConsistencyTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BIPConsistencyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.net.URL;
 import java.io.IOException;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BSQ.hdr
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQ.hdr
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BSQ.hdr
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQ.hdr
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BSQ.raw
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQ.raw
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BSQ.raw
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQ.raw
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
index e81535e6e8..842f96d9df 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/BSQConsistencyTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/BSQConsistencyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.net.URL;
 import java.io.IOException;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/WritableStoreTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/WritableStoreTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java
index 89eb00e8b7..40452b6f9e 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/WritableStoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/WritableStoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.esri;
+package org.apache.sis.storage.esri;
 
 import java.nio.file.Path;
 import java.nio.file.Files;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/grid.asc
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/grid.asc
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/grid.asc
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/grid.asc
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/grid.clr
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/grid.clr
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/grid.clr
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/grid.clr
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/grid.prj
 b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/grid.prj
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/esri/grid.prj
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/esri/grid.prj
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/StoreTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/StoreTest.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/StoreTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/StoreTest.java
index 6e6de3aa01..0ab30e36b5 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/StoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/StoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.folder;
+package org.apache.sis.storage.folder;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/README.txt
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/README.txt
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/README.txt
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/README.txt
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/crs.prj
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/crs.prj
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/crs.prj
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/crs.prj
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data1.xml
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data1.xml
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data1.xml
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data1.xml
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data2.xml
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data2.xml
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data2.xml
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data2.xml
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data3.xml
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data3.xml
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data3.xml
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data3.xml
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data4/data5.xml
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data4/data5.xml
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/folder/test-data/data4/data5.xml
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/folder/test-data/data4/data5.xml
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/README.md
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/README.md
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/README.md
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/README.md
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/SelfConsistencyTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/SelfConsistencyTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java
index 281f709d94..a9fc1321c7 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/SelfConsistencyTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/SelfConsistencyTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.net.URL;
 import java.io.IOException;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/WorldFileStoreTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/WorldFileStoreTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
index 0b1e36aaad..0975940eda 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/WorldFileStoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/WorldFileStoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.image;
+package org.apache.sis.storage.image;
 
 import java.io.IOException;
 import java.nio.file.Path;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/gradient.pgw
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/gradient.pgw
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/gradient.pgw
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/gradient.pgw
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/gradient.png
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/gradient.png
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/gradient.png
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/gradient.png
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/gradient.prj
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/gradient.prj
similarity index 100%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/image/gradient.prj
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/image/gradient.prj
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreProviderTest.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreProviderTest.java
index ac48093354..78897eaeb5 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/wkt/StoreProviderTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreProviderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.wkt;
+package org.apache.sis.storage.wkt;
 
 import java.io.StringReader;
 import org.apache.sis.storage.StorageConnector;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/wkt/StoreTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
similarity index 98%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/wkt/StoreTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
index 6398f76486..ce4ef17e6e 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/wkt/StoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/wkt/StoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.wkt;
+package org.apache.sis.storage.wkt;
 
 import java.io.StringReader;
 import java.io.ByteArrayInputStream;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java
index 5e88c304a5..73a13ba90b 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/MimeTypeDetectorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.util.Map;
 import java.io.IOException;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/StoreProviderTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreProviderTest.java
similarity index 97%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/StoreProviderTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreProviderTest.java
index f0dc680695..4252773ef3 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/StoreProviderTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreProviderTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.io.StringReader;
 import org.apache.sis.storage.StorageConnector;
diff --git 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/StoreTest.java
 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreTest.java
similarity index 99%
rename from 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/StoreTest.java
rename to 
endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreTest.java
index 83c9ac0cd5..3eea1be2d8 100644
--- 
a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/internal/storage/xml/StoreTest.java
+++ 
b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/xml/StoreTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.storage.xml;
+package org.apache.sis.storage.xml;
 
 import java.util.Locale;
 import java.io.StringReader;
diff --git 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
index 697cc905cd..e9b98b32ce 100644
--- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
+++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/DataViewer.java
@@ -238,8 +238,8 @@ public class DataViewer extends Application {
                      * we can auto-detect the format. Keep GPX at writing time 
because we need
                      * to be specific about the format to write.
                      */
-                    case 
org.apache.sis.internal.storage.wkt.StoreProvider.NAME: continue;
-                    case 
org.apache.sis.internal.storage.xml.StoreProvider.NAME: write = false; break;
+                    case org.apache.sis.storage.wkt.StoreProvider.NAME: 
continue;
+                    case org.apache.sis.storage.xml.StoreProvider.NAME: write 
= false; break;
                     case org.apache.sis.storage.gpx.StoreProvider.NAME: read  
= false; break;
                 }
                 String label = null;
diff --git 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
index 7fde4ad65f..38257c8966 100644
--- 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
+++ 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/ResourceItem.java
@@ -29,7 +29,7 @@ import org.apache.sis.storage.Resource;
 import org.apache.sis.storage.Aggregate;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.aggregate.MergeStrategy;
-import org.apache.sis.internal.storage.folder.UnstructuredAggregate;
+import org.apache.sis.storage.folder.UnstructuredAggregate;
 import org.apache.sis.gui.internal.DataStoreOpener;
 import org.apache.sis.gui.internal.BackgroundThreads;
 import org.apache.sis.gui.internal.GUIUtilities;
diff --git 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/TreeViewType.java
 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/TreeViewType.java
index f253c90a9b..8d6bd59022 100644
--- 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/TreeViewType.java
+++ 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/dataset/TreeViewType.java
@@ -16,7 +16,7 @@
  */
 package org.apache.sis.gui.dataset;
 
-import org.apache.sis.internal.storage.folder.UnstructuredAggregate;
+import org.apache.sis.storage.folder.UnstructuredAggregate;
 
 
 /**
diff --git 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java
 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java
index c5d214581f..06d185684d 100644
--- 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java
+++ 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataFormats.java
@@ -17,7 +17,7 @@
 package org.apache.sis.gui.internal;
 
 import javafx.scene.input.DataFormat;
-import org.apache.sis.internal.storage.xml.AbstractProvider;
+import org.apache.sis.storage.xml.AbstractProvider;
 
 
 /**
diff --git 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataStoreOpener.java
 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataStoreOpener.java
index 3af0405b3c..0ed81af9fa 100644
--- 
a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataStoreOpener.java
+++ 
b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/internal/DataStoreOpener.java
@@ -48,7 +48,7 @@ import org.apache.sis.internal.util.Strings;
 import org.apache.sis.internal.storage.io.IOUtilities;
 import org.apache.sis.internal.storage.io.ChannelFactory;
 import org.apache.sis.internal.storage.io.InternalOptionKey;
-import org.apache.sis.internal.storage.folder.ConcurrentCloser;
+import org.apache.sis.storage.folder.ConcurrentCloser;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.gui.DataViewer;