diff --git a/src/tutorials/java/RefiningPleiades/GroundRefining.java b/src/tutorials/java/RefiningPleiades/GroundRefining.java
index 4703b072ffb57517ffa63975a2aa8ba2e3bade9d..0ee1e3a407c0285529314ca43918c853444a51d8 100644
--- a/src/tutorials/java/RefiningPleiades/GroundRefining.java
+++ b/src/tutorials/java/RefiningPleiades/GroundRefining.java
@@ -37,12 +37,8 @@ import org.orekit.rugged.api.Rugged;
 import org.orekit.rugged.api.RuggedBuilder;
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.refining.generators.GroundMeasureGenerator;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.SensorToGroundMapping;
-import org.orekit.rugged.refining.metrics.DistanceTools;
-import org.orekit.rugged.refining.models.OrbitModel;
-import org.orekit.rugged.refining.models.PleiadesViewingModel;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.utils.AngularDerivativesFilter;
 import org.orekit.utils.CartesianDerivativesFilter;
@@ -50,6 +46,11 @@ import org.orekit.utils.PVCoordinates;
 import org.orekit.utils.TimeStampedAngularCoordinates;
 import org.orekit.utils.TimeStampedPVCoordinates;
 
+import RefiningPleiades.generators.GroundMeasureGenerator;
+import RefiningPleiades.metrics.DistanceTools;
+import RefiningPleiades.models.OrbitModel;
+import RefiningPleiades.models.PleiadesViewingModel;
+
 /**
  * Class for testing refining (fulcrum points study)
  * with or without noisy measurements
diff --git a/src/tutorials/java/RefiningPleiades/InterRefining.java b/src/tutorials/java/RefiningPleiades/InterRefining.java
index 9d17f7a2d1315091db436ceba44ee382b9adceb8..75f9fa8ef3c7f837abe9a4b1644bbf21510416ce 100644
--- a/src/tutorials/java/RefiningPleiades/InterRefining.java
+++ b/src/tutorials/java/RefiningPleiades/InterRefining.java
@@ -39,13 +39,8 @@ import org.orekit.rugged.api.Rugged;
 import org.orekit.rugged.api.RuggedBuilder;
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.linesensor.LineSensor;
-import org.orekit.rugged.refining.generators.GroundMeasureGenerator;
-import org.orekit.rugged.refining.generators.InterMeasureGenerator;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.SensorToGroundMapping;
-import org.orekit.rugged.refining.metrics.DistanceTools;
-import org.orekit.rugged.refining.models.OrbitModel;
-import org.orekit.rugged.refining.models.PleiadesViewingModel;
 import org.orekit.time.AbsoluteDate;
 import org.orekit.utils.AngularDerivativesFilter;
 import org.orekit.utils.CartesianDerivativesFilter;
@@ -53,6 +48,12 @@ import org.orekit.utils.PVCoordinates;
 import org.orekit.utils.TimeStampedAngularCoordinates;
 import org.orekit.utils.TimeStampedPVCoordinates;
 
+import RefiningPleiades.generators.GroundMeasureGenerator;
+import RefiningPleiades.generators.InterMeasureGenerator;
+import RefiningPleiades.metrics.DistanceTools;
+import RefiningPleiades.models.OrbitModel;
+import RefiningPleiades.models.PleiadesViewingModel;
+
 /**
  * Class for testing refining (liaison points study)
  * with or without noisy measurements
diff --git a/src/tutorials/java/RefiningPleiades/Refining.java b/src/tutorials/java/RefiningPleiades/Refining.java
index 5d71a81fde6e1a24162b7fc050500541bdaf607f..6b0cacbccc96db7691f0a146ab53c176addb2d51 100644
--- a/src/tutorials/java/RefiningPleiades/Refining.java
+++ b/src/tutorials/java/RefiningPleiades/Refining.java
@@ -28,13 +28,14 @@ import org.orekit.rugged.adjustment.AdjustmentContext;
 import org.orekit.rugged.api.Rugged;
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.errors.RuggedMessages;
-import org.orekit.rugged.refining.generators.GroundMeasureGenerator;
-import org.orekit.rugged.refining.generators.InterMeasureGenerator;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.Observables;
 import org.orekit.rugged.refining.measures.SensorToGroundMapping;
 import org.orekit.rugged.refining.measures.SensorToSensorMapping;
-import org.orekit.rugged.refining.metrics.LocalisationMetrics;
+
+import RefiningPleiades.generators.GroundMeasureGenerator;
+import RefiningPleiades.generators.InterMeasureGenerator;
+import RefiningPleiades.metrics.LocalisationMetrics;
 
 /**
  * Class for refining problems common methods
diff --git a/src/main/java/org/orekit/rugged/refining/generators/GroundMeasureGenerator.java b/src/tutorials/java/RefiningPleiades/generators/GroundMeasureGenerator.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/refining/generators/GroundMeasureGenerator.java
rename to src/tutorials/java/RefiningPleiades/generators/GroundMeasureGenerator.java
index 6d9bc4c6852e6dc218b649d9a4830a49f5b1f888..8d0c98ec9c531a6ae203ff92f83a0cfb26ff7809 100644
--- a/src/main/java/org/orekit/rugged/refining/generators/GroundMeasureGenerator.java
+++ b/src/tutorials/java/RefiningPleiades/generators/GroundMeasureGenerator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.generators;
+package RefiningPleiades.generators;
 
 import org.hipparchus.geometry.euclidean.threed.Vector3D;
 import org.hipparchus.random.GaussianRandomGenerator;
diff --git a/src/main/java/org/orekit/rugged/refining/generators/InterMeasureGenerator.java b/src/tutorials/java/RefiningPleiades/generators/InterMeasureGenerator.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/refining/generators/InterMeasureGenerator.java
rename to src/tutorials/java/RefiningPleiades/generators/InterMeasureGenerator.java
index 3fa808ad7350ca6efeaf20023b67b8a9640aad91..f13cab474cc7022a27c69f7719b6bea4e5dafa4f 100644
--- a/src/main/java/org/orekit/rugged/refining/generators/InterMeasureGenerator.java
+++ b/src/tutorials/java/RefiningPleiades/generators/InterMeasureGenerator.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.generators;
+package RefiningPleiades.generators;
 
 import org.hipparchus.random.GaussianRandomGenerator;
 import org.hipparchus.random.UncorrelatedRandomVectorGenerator;
@@ -29,10 +29,11 @@ import org.orekit.rugged.linesensor.SensorPixel;
 import org.orekit.rugged.refining.measures.Noise;
 import org.orekit.rugged.refining.measures.Observables;
 import org.orekit.rugged.refining.measures.SensorToSensorMapping;
-import org.orekit.rugged.refining.metrics.DistanceTools;
 import org.orekit.rugged.utils.SpacecraftToObservedBody;
 import org.orekit.time.AbsoluteDate;
 
+import RefiningPleiades.metrics.DistanceTools;
+
 /**
  * Inter-measures generator (sensor to sensor mapping).
  * @author Jonathan Guinet
diff --git a/src/main/java/org/orekit/rugged/refining/generators/Measurable.java b/src/tutorials/java/RefiningPleiades/generators/Measurable.java
similarity index 97%
rename from src/main/java/org/orekit/rugged/refining/generators/Measurable.java
rename to src/tutorials/java/RefiningPleiades/generators/Measurable.java
index 985663aa0053a8e801391f31d803dd3a39f83907..ab00f2ec123cfe75f2adebd6abbaca571dc91948 100644
--- a/src/main/java/org/orekit/rugged/refining/generators/Measurable.java
+++ b/src/tutorials/java/RefiningPleiades/generators/Measurable.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.generators;
+package RefiningPleiades.generators;
 
 import org.orekit.rugged.errors.RuggedException;
 import org.orekit.rugged.refining.measures.Noise;
diff --git a/src/main/java/org/orekit/rugged/refining/metrics/DistanceTools.java b/src/tutorials/java/RefiningPleiades/metrics/DistanceTools.java
similarity index 96%
rename from src/main/java/org/orekit/rugged/refining/metrics/DistanceTools.java
rename to src/tutorials/java/RefiningPleiades/metrics/DistanceTools.java
index 3e4184a25f4c7e8577316e2b211e02484d6cfde4..e48c97fc716b75f4a993d9f8cfae68aefec8ad50 100644
--- a/src/main/java/org/orekit/rugged/refining/metrics/DistanceTools.java
+++ b/src/tutorials/java/RefiningPleiades/metrics/DistanceTools.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.metrics;
+package RefiningPleiades.metrics;
 
 import org.hipparchus.geometry.euclidean.threed.Vector3D;
 import org.hipparchus.util.FastMath;
@@ -42,7 +42,7 @@ public class DistanceTools {
      * @param lat1 Latitude of first geodetic point (rad)
      * @param long2 Longitude of second geodetic point (rad)
      * @param lat2 Latitude of second geodetic point (rad)
-     * @param computeAngular if true, distance will be angular
+     * @param computeAngular if true, distance will be angular, otherwise will be in meters
      * @return distance in meters or radians if flag computeAngular is true
      */
     public static double computeDistance(final double long1, final double lat1,
diff --git a/src/main/java/org/orekit/rugged/refining/metrics/LocalisationMetrics.java b/src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java
similarity index 97%
rename from src/main/java/org/orekit/rugged/refining/metrics/LocalisationMetrics.java
rename to src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java
index b6662f62ca01991195daee0e2d728fc83b171d04..93a97ffc3b0f0c793af28575f4eb4e8307bb1a3b 100644
--- a/src/main/java/org/orekit/rugged/refining/metrics/LocalisationMetrics.java
+++ b/src/tutorials/java/RefiningPleiades/metrics/LocalisationMetrics.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.metrics;
+package RefiningPleiades.metrics;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -142,11 +142,11 @@ public class LocalisationMetrics {
 
             final GeodeticPoint esGP = rugged.directLocation(date, lineSensor.getPosition(),
                                                              lineSensor.getLOS(date,
-                                                                               (int) gtSP.getPixelNumber()));
+                                                             (int) gtSP.getPixelNumber()));
             // Compute distance
             double distance = DistanceTools.computeDistance(esGP.getLongitude(), esGP.getLatitude(),
-                                                     gtGP.getLongitude(), gtGP.getLatitude(),
-                                                     computeAngular);
+                                                            gtGP.getLongitude(), gtGP.getLatitude(),
+                                                            computeAngular);
             count += distance;
             if (distance > resMax) {
                 resMax = distance;
diff --git a/src/main/java/org/orekit/rugged/refining/models/OrbitModel.java b/src/tutorials/java/RefiningPleiades/models/OrbitModel.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/refining/models/OrbitModel.java
rename to src/tutorials/java/RefiningPleiades/models/OrbitModel.java
index c77028df17990674813da340f04b67047d9ea322..5c19aa9ef83396d1203da07c5edd6bd6313198bb 100644
--- a/src/main/java/org/orekit/rugged/refining/models/OrbitModel.java
+++ b/src/tutorials/java/RefiningPleiades/models/OrbitModel.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.models;
+package RefiningPleiades.models;
 
 import org.hipparchus.geometry.euclidean.threed.Rotation;
 import org.hipparchus.geometry.euclidean.threed.RotationOrder;
diff --git a/src/main/java/org/orekit/rugged/refining/models/PleiadesViewingModel.java b/src/tutorials/java/RefiningPleiades/models/PleiadesViewingModel.java
similarity index 99%
rename from src/main/java/org/orekit/rugged/refining/models/PleiadesViewingModel.java
rename to src/tutorials/java/RefiningPleiades/models/PleiadesViewingModel.java
index 2051061b7e2e986da66d4ac479fbfceaa2a241b8..83541a8b61943e53c3a14ad7c7771e3b2ea899df 100644
--- a/src/main/java/org/orekit/rugged/refining/models/PleiadesViewingModel.java
+++ b/src/tutorials/java/RefiningPleiades/models/PleiadesViewingModel.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.orekit.rugged.refining.models;
+package RefiningPleiades.models;
 
 import org.hipparchus.geometry.euclidean.threed.Rotation;
 import org.hipparchus.geometry.euclidean.threed.RotationConvention;