diff --git a/geotiff/src/test/java/org/orekit/rugged/geotiff/AsterTileUpdaterTest.java b/geotiff/src/test/java/org/orekit/rugged/geotiff/AsterTileUpdaterTest.java
index 01906392dd79f198a57b68296099810550ea6cb4..a17ba47df9fc0c32760d00fb8ef9325c1865bc12 100644
--- a/geotiff/src/test/java/org/orekit/rugged/geotiff/AsterTileUpdaterTest.java
+++ b/geotiff/src/test/java/org/orekit/rugged/geotiff/AsterTileUpdaterTest.java
@@ -32,9 +32,9 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.core.raster.SimpleTile;
-import org.orekit.rugged.core.raster.SimpleTileFactory;
-import org.orekit.rugged.core.raster.TileFactory;
+import org.orekit.rugged.raster.SimpleTile;
+import org.orekit.rugged.raster.SimpleTileFactory;
+import org.orekit.rugged.raster.TileFactory;
 
 
 public class AsterTileUpdaterTest {
diff --git a/src/main/java/org/orekit/rugged/api/Rugged.java b/src/main/java/org/orekit/rugged/api/Rugged.java
index b6d841f4eb9f14f5c7eed37f098391081a240151..0ea789844756e6e0dbddde3d02641855e020baa8 100644
--- a/src/main/java/org/orekit/rugged/api/Rugged.java
+++ b/src/main/java/org/orekit/rugged/api/Rugged.java
@@ -44,7 +44,7 @@ import org.orekit.rugged.core.ExtendedEllipsoid;
 import org.orekit.rugged.core.IgnoreDEMAlgorithm;
 import org.orekit.rugged.core.SpacecraftToObservedBody;
 import org.orekit.rugged.core.duvenhage.DuvenhageAlgorithm;
-import org.orekit.rugged.core.raster.IntersectionAlgorithm;
+import org.orekit.rugged.raster.IntersectionAlgorithm;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.utils.Constants;
 import org.orekit.utils.IERSConventions;
diff --git a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java b/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
index 7feea66387d19a93605bd1552c963678f27f809a..2a62c35a14d7b1fbca18c9b6b41f14472b4dbdfc 100644
--- a/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/BasicScanAlgorithm.java
@@ -25,11 +25,11 @@ import org.orekit.bodies.GeodeticPoint;
 import org.orekit.errors.OrekitException;
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.raster.IntersectionAlgorithm;
-import org.orekit.rugged.core.raster.SimpleTile;
-import org.orekit.rugged.core.raster.SimpleTileFactory;
-import org.orekit.rugged.core.raster.Tile;
-import org.orekit.rugged.core.raster.TilesCache;
+import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.raster.SimpleTile;
+import org.orekit.rugged.raster.SimpleTileFactory;
+import org.orekit.rugged.raster.Tile;
+import org.orekit.rugged.raster.TilesCache;
 
 /** Intersection computation using a basic algorithm based on exhaustive scan.
  * <p>
diff --git a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java b/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
index 9eef0a66418a944dced02ff9de82f82ad171bdc0..fe9b98e5d2c6ab29258888fa6e932157180202ec 100644
--- a/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/IgnoreDEMAlgorithm.java
@@ -20,7 +20,7 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.orekit.bodies.GeodeticPoint;
 import org.orekit.errors.OrekitException;
 import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.core.raster.IntersectionAlgorithm;
+import org.orekit.rugged.raster.IntersectionAlgorithm;
 
 /** Intersection ignoring Digital Elevation Model.
  * <p>
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java b/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
index 6bfd8992b21623aea95be6ad370592338e93f62f..0c844d8d496d688bdd4121e3170182073562c166 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithm.java
@@ -24,9 +24,9 @@ import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.RuggedMessages;
 import org.orekit.rugged.api.TileUpdater;
 import org.orekit.rugged.core.ExtendedEllipsoid;
-import org.orekit.rugged.core.raster.IntersectionAlgorithm;
-import org.orekit.rugged.core.raster.Tile;
-import org.orekit.rugged.core.raster.TilesCache;
+import org.orekit.rugged.raster.IntersectionAlgorithm;
+import org.orekit.rugged.raster.Tile;
+import org.orekit.rugged.raster.TilesCache;
 
 /** Digital Elevation Model intersection using Bernardt Duvenhage's algorithm.
  * <p>
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java b/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
index 203a6ce43afde0d65a49fe6c135da632fef77a15..f5e7c81d07d1fa313c81e15a0a123a4d794eaba7 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
+++ b/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTile.java
@@ -20,9 +20,9 @@ import org.apache.commons.math3.analysis.BivariateFunction;
 import org.apache.commons.math3.analysis.function.Max;
 import org.apache.commons.math3.analysis.function.Min;
 import org.apache.commons.math3.util.FastMath;
-import org.orekit.rugged.core.raster.SimpleTile;
+import org.orekit.rugged.raster.SimpleTile;
 
-/** Simple implementation of a {@link org.orekit.rugged.core.raster.Tile}
+/** Simple implementation of a {@link org.orekit.rugged.raster.Tile}
  * with a min/max kd tree.
  * <p>
  * A n level min/max kd-tree contains sub-tiles merging individual pixels
diff --git a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java b/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
index 186e16b79d1085f3b536b6876fd120b054f94b36..716b4f7f33280020d6142a2504342861fc095f23 100644
--- a/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
+++ b/src/main/java/org/orekit/rugged/core/duvenhage/MinMaxTreeTileFactory.java
@@ -16,7 +16,7 @@
  */
 package org.orekit.rugged.core.duvenhage;
 
-import org.orekit.rugged.core.raster.TileFactory;
+import org.orekit.rugged.raster.TileFactory;
 
 /** Simple implementation of a {@link TileFactory} for {@link MinMaxTreeTile}.
  * @author Luc Maisonobe
diff --git a/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java b/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
similarity index 98%
rename from src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
rename to src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
index 1bbd8d571149888162b953f439dd0a1ff9dd14a8..8e8f6b52fb5152802548ccc0124c628ae048b1de 100644
--- a/src/main/java/org/orekit/rugged/core/raster/IntersectionAlgorithm.java
+++ b/src/main/java/org/orekit/rugged/raster/IntersectionAlgorithm.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.orekit.bodies.GeodeticPoint;
diff --git a/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java b/src/main/java/org/orekit/rugged/raster/SimpleTile.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/raster/SimpleTile.java
rename to src/main/java/org/orekit/rugged/raster/SimpleTile.java
index b9770f60a082b1b625c7645d04a911b643e8dc46..ecb2d701e6188604f57fa6b76d85e9bd4769f627 100644
--- a/src/main/java/org/orekit/rugged/core/raster/SimpleTile.java
+++ b/src/main/java/org/orekit/rugged/raster/SimpleTile.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.apache.commons.math3.util.FastMath;
diff --git a/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java b/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
similarity index 92%
rename from src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java
rename to src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
index 7fa780857cd2a10fae38d40e19123ac6d7e7c347..149a8696482d3c76ee366938be2a2ab94af3c131 100644
--- a/src/main/java/org/orekit/rugged/core/raster/SimpleTileFactory.java
+++ b/src/main/java/org/orekit/rugged/raster/SimpleTileFactory.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
-import org.orekit.rugged.core.raster.TileFactory;
+import org.orekit.rugged.raster.TileFactory;
 
 /** Simple implementation of a {@link TileFactory} for {@link SimpleTile}.
  * @author Luc Maisonobe
diff --git a/src/main/java/org/orekit/rugged/core/raster/Tile.java b/src/main/java/org/orekit/rugged/raster/Tile.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/raster/Tile.java
rename to src/main/java/org/orekit/rugged/raster/Tile.java
index 4de36d2a5a1b642f2027a0210c3b8e3e31ac7ca8..75e3ddc92853d2003ed028f521b5264db17b14a4 100644
--- a/src/main/java/org/orekit/rugged/core/raster/Tile.java
+++ b/src/main/java/org/orekit/rugged/raster/Tile.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.orekit.bodies.GeodeticPoint;
diff --git a/src/main/java/org/orekit/rugged/core/raster/TileFactory.java b/src/main/java/org/orekit/rugged/raster/TileFactory.java
similarity index 96%
rename from src/main/java/org/orekit/rugged/core/raster/TileFactory.java
rename to src/main/java/org/orekit/rugged/raster/TileFactory.java
index abb629ae0f0b57623bbbba9db9488dec1e537a5f..9ae7f50fa922d83afc629027b744ca807c489d09 100644
--- a/src/main/java/org/orekit/rugged/core/raster/TileFactory.java
+++ b/src/main/java/org/orekit/rugged/raster/TileFactory.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 
 /** Interface representing a factory for raster tile.
diff --git a/src/main/java/org/orekit/rugged/core/raster/TilesCache.java b/src/main/java/org/orekit/rugged/raster/TilesCache.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/core/raster/TilesCache.java
rename to src/main/java/org/orekit/rugged/raster/TilesCache.java
index 877f5c0a8ed210c25ebcfc6418882d1ca06dbf16..d3f74c986e0dc412fef80b7256d0b28a4250bf7f 100644
--- a/src/main/java/org/orekit/rugged/core/raster/TilesCache.java
+++ b/src/main/java/org/orekit/rugged/raster/TilesCache.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.raster.Tile.Location;
+import org.orekit.rugged.raster.Tile.Location;
 
 /** Cache for Digital Elevation Model {@link Tile tiles}.
  * <p>
diff --git a/src/test/java/org/orekit/rugged/api/RuggedTest.java b/src/test/java/org/orekit/rugged/api/RuggedTest.java
index 5adcf387819929bc664329631694b93400164621..3214bc10bdaa936fc4d88c51ad5680c21b78d6f0 100644
--- a/src/test/java/org/orekit/rugged/api/RuggedTest.java
+++ b/src/test/java/org/orekit/rugged/api/RuggedTest.java
@@ -65,8 +65,8 @@ import org.orekit.propagation.SpacecraftState;
 import org.orekit.propagation.analytical.KeplerianPropagator;
 import org.orekit.propagation.numerical.NumericalPropagator;
 import org.orekit.propagation.sampling.OrekitFixedStepHandler;
-import org.orekit.rugged.core.raster.RandomLandscapeUpdater;
-import org.orekit.rugged.core.raster.VolcanicConeElevationUpdater;
+import org.orekit.rugged.raster.RandomLandscapeUpdater;
+import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.time.TimeScalesFactory;
 import org.orekit.utils.Constants;
diff --git a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java b/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
index a5e64033c7e435f5c8be869a22ff36bb914cbe72..c9bbe50f116c87ba93cbbc28bdc1f8f3b592a802 100644
--- a/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/core/AbstractAlgorithmTest.java
@@ -41,9 +41,9 @@ import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.TileUpdater;
 import org.orekit.rugged.core.duvenhage.MinMaxTreeTile;
 import org.orekit.rugged.core.duvenhage.MinMaxTreeTileFactory;
-import org.orekit.rugged.core.raster.CliffsElevationUpdater;
-import org.orekit.rugged.core.raster.IntersectionAlgorithm;
-import org.orekit.rugged.core.raster.VolcanicConeElevationUpdater;
+import org.orekit.rugged.raster.CliffsElevationUpdater;
+import org.orekit.rugged.raster.VolcanicConeElevationUpdater;
+import org.orekit.rugged.raster.IntersectionAlgorithm;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.time.TimeScalesFactory;
 import org.orekit.utils.Constants;
diff --git a/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java b/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
index 29ba657cab21bf7431d34a89499460750573bdac..1830fedaeff8128f483c869828aa26c97f17636b 100644
--- a/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/core/BasicScanAlgorithmTest.java
@@ -18,7 +18,7 @@ package org.orekit.rugged.core;
 
 
 import org.orekit.rugged.api.TileUpdater;
-import org.orekit.rugged.core.raster.IntersectionAlgorithm;
+import org.orekit.rugged.raster.IntersectionAlgorithm;
 
 public class BasicScanAlgorithmTest extends AbstractAlgorithmTest {
 
diff --git a/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java b/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
index 30ad08c2537bc8d2f8a391863c2be397cc08c0fd..f202ddff55eda98ab0f9e8bfc3233e6a173d46e9 100644
--- a/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
+++ b/src/test/java/org/orekit/rugged/core/duvenhage/DuvenhageAlgorithmTest.java
@@ -24,7 +24,7 @@ import org.orekit.errors.OrekitException;
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.TileUpdater;
 import org.orekit.rugged.core.AbstractAlgorithmTest;
-import org.orekit.rugged.core.raster.IntersectionAlgorithm;
+import org.orekit.rugged.raster.IntersectionAlgorithm;
 
 public class DuvenhageAlgorithmTest extends AbstractAlgorithmTest {
 
diff --git a/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
similarity index 98%
rename from src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java
rename to src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
index 3ea300d779f42ee29aa30e3b67690ca3d42bebb7..8f9ba3aa2b51eb5c1a408663d4b4829efaba0309 100644
--- a/src/test/java/org/orekit/rugged/core/raster/CheckedPatternElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CheckedPatternElevationUpdater.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.util.FastMath;
 import org.orekit.rugged.api.RuggedException;
diff --git a/src/test/java/org/orekit/rugged/core/raster/CliffsElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
similarity index 98%
rename from src/test/java/org/orekit/rugged/core/raster/CliffsElevationUpdater.java
rename to src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
index bfba23c50bee02324004e9e8fb1789b5895fc9e5..4f31e7a0c8a85891309d61c9181d59a2b5b28dee 100644
--- a/src/test/java/org/orekit/rugged/core/raster/CliffsElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/CliffsElevationUpdater.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.util.FastMath;
 import org.orekit.bodies.GeodeticPoint;
diff --git a/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java b/src/test/java/org/orekit/rugged/raster/CountingFactory.java
similarity index 86%
rename from src/test/java/org/orekit/rugged/core/raster/CountingFactory.java
rename to src/test/java/org/orekit/rugged/raster/CountingFactory.java
index c336fa4aca067c6dcf58692f854500fd3913c8cc..1a1f6fcb1fe003ceb84dd8844956855ed4b5c55c 100644
--- a/src/test/java/org/orekit/rugged/core/raster/CountingFactory.java
+++ b/src/test/java/org/orekit/rugged/raster/CountingFactory.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
-import org.orekit.rugged.core.raster.SimpleTile;
-import org.orekit.rugged.core.raster.SimpleTileFactory;
-import org.orekit.rugged.core.raster.TileFactory;
+import org.orekit.rugged.raster.SimpleTile;
+import org.orekit.rugged.raster.SimpleTileFactory;
+import org.orekit.rugged.raster.TileFactory;
 
 public class CountingFactory implements TileFactory<SimpleTile> {
 
diff --git a/src/test/java/org/orekit/rugged/core/raster/RandomLandscapeUpdater.java b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
similarity index 99%
rename from src/test/java/org/orekit/rugged/core/raster/RandomLandscapeUpdater.java
rename to src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
index b8e0e55eb6b111c3de489b1c182f363fe146e792..b3c5f28fff9e87710e58d96bb3273d9dfe386db8 100644
--- a/src/test/java/org/orekit/rugged/core/raster/RandomLandscapeUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/RandomLandscapeUpdater.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.exception.MathIllegalArgumentException;
 import org.apache.commons.math3.exception.util.LocalizedFormats;
diff --git a/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java b/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
similarity index 98%
rename from src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java
rename to src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
index 7b68448a4b1876a8dcea6203e5872ab6d03df499..a71c1ce171a7b9fb20f183ae4ce879d1020fb108 100644
--- a/src/test/java/org/orekit/rugged/core/raster/SimpleTileTest.java
+++ b/src/test/java/org/orekit/rugged/raster/SimpleTileTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 import org.apache.commons.math3.util.FastMath;
@@ -23,10 +23,10 @@ import org.junit.Test;
 import org.orekit.bodies.GeodeticPoint;
 import org.orekit.rugged.api.RuggedException;
 import org.orekit.rugged.api.RuggedMessages;
-import org.orekit.rugged.core.raster.SimpleTile;
-import org.orekit.rugged.core.raster.SimpleTileFactory;
-import org.orekit.rugged.core.raster.Tile;
-import org.orekit.rugged.core.raster.Tile.Location;
+import org.orekit.rugged.raster.SimpleTile;
+import org.orekit.rugged.raster.SimpleTileFactory;
+import org.orekit.rugged.raster.Tile;
+import org.orekit.rugged.raster.Tile.Location;
 
 public class SimpleTileTest {
 
diff --git a/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java b/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
similarity index 98%
rename from src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java
rename to src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
index ea9102e33bfa6803c02f68b50158d86a0767a9e7..620b03fdbd31ab672e6e94fbbd8c18f90b7ed183 100644
--- a/src/test/java/org/orekit/rugged/core/raster/TilesCacheTest.java
+++ b/src/test/java/org/orekit/rugged/raster/TilesCacheTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.random.RandomGenerator;
 import org.apache.commons.math3.random.Well19937a;
@@ -22,8 +22,8 @@ import org.apache.commons.math3.util.FastMath;
 import org.junit.Assert;
 import org.junit.Test;
 import org.orekit.rugged.api.RuggedException;
-import org.orekit.rugged.core.raster.SimpleTile;
-import org.orekit.rugged.core.raster.TilesCache;
+import org.orekit.rugged.raster.SimpleTile;
+import org.orekit.rugged.raster.TilesCache;
 
 public class TilesCacheTest {
 
diff --git a/src/test/java/org/orekit/rugged/core/raster/VolcanicConeElevationUpdater.java b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
similarity index 98%
rename from src/test/java/org/orekit/rugged/core/raster/VolcanicConeElevationUpdater.java
rename to src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
index 37e8a0521493daff932c61a6e383590d1bd89475..63198a6028ce1b362c5d457cbbd07327e9f489a3 100644
--- a/src/test/java/org/orekit/rugged/core/raster/VolcanicConeElevationUpdater.java
+++ b/src/test/java/org/orekit/rugged/raster/VolcanicConeElevationUpdater.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.core.raster;
+package org.orekit.rugged.raster;
 
 import org.apache.commons.math3.util.FastMath;
 import org.orekit.bodies.GeodeticPoint;