diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Order.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Order.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Order.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Order.java
index 6060e7ba4ee..d2cd76201eb 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Order.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Order.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ProductType.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ProductType.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ProductType.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ProductType.java
index 4589cd7b3b9..6c7b6f84f97 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ProductType.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ProductType.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Identifiable;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Receiver.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Receiver.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Receiver.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Receiver.java
index 631130ba87a..3faee4fc53b 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Receiver.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Receiver.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverAgent.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverAgent.java
index df29bc43a71..df4c6d6f948 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverAgent.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverAgent.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverConfigGroup.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverConfigGroup.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverConfigGroup.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverConfigGroup.java
index dfbc6cbe4a5..e42150f9b8f 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverConfigGroup.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverConfigGroup.java
@@ -15,7 +15,7 @@
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverControlerListener.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverControlerListener.java
index 10fe1be6bdd..852452663a6 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverControlerListener.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverControlerListener.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import com.google.inject.Inject;
import org.apache.logging.log4j.LogManager;
@@ -29,8 +29,8 @@
import org.matsim.freight.carriers.CarriersUtils;
import org.matsim.freight.carriers.ScheduledTour;
import org.matsim.freight.carriers.Tour;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
-import org.matsim.contrib.freightreceiver.replanning.ReceiverStrategyManager;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.replanning.ReceiverStrategyManager;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.controler.events.*;
import org.matsim.core.controler.listener.*;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocation.java
similarity index 96%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocation.java
index 72ccdeb68fa..c01f7425f9b 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocation.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocation.java
@@ -18,7 +18,7 @@
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.freight.carriers.Carrier;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationEqualProportion.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationEqualProportion.java
index 6f85efcd2f1..ae79d2db6c5 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationEqualProportion.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationEqualProportion.java
@@ -18,7 +18,7 @@
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import com.google.inject.Inject;
import org.matsim.api.core.v01.Id;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationFixed.java
similarity index 97%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationFixed.java
index 5f3a6a2dea2..fed9d76f609 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixed.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationFixed.java
@@ -17,7 +17,7 @@
* *
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.matsim.freight.carriers.Carrier;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationType.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationType.java
similarity index 96%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationType.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationType.java
index 9ad1862b9c9..c4b110f8266 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationType.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverCostAllocationType.java
@@ -18,7 +18,7 @@
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
/**
* The supported ways in which the carrier's cost is spread among the receivers.
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverImpl.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverImpl.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverImpl.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverImpl.java
index 1f29889a0a6..59b70767176 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverImpl.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverImpl.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverModule.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverModule.java
similarity index 96%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverModule.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverModule.java
index aac11b5e7b2..a108dbf87f4 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverModule.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverModule.java
@@ -16,14 +16,15 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.matsim.freight.carriers.Carrier;
-import org.matsim.contrib.freightreceiver.replanning.*;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.controler.AbstractModule;
+import org.matsim.freight.receiver.replanning.ReceiverReplanningUtils;
+import org.matsim.freight.receiver.replanning.ReceiverStrategyManager;
public final class ReceiverModule extends AbstractModule {
final private static Logger LOG = LogManager.getLogger(ReceiverModule.class);
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverOrder.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverOrder.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverOrder.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverOrder.java
index 081004dcb71..cad5c103842 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverOrder.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverOrder.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverPlan.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverPlan.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverPlan.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverPlan.java
index 0497d364b3d..88a8fe76268 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverPlan.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverPlan.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -25,7 +25,7 @@
import org.matsim.api.core.v01.population.Person;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.TimeWindow;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
import org.matsim.utils.objectattributes.attributable.Attributable;
import org.matsim.utils.objectattributes.attributable.Attributes;
import org.matsim.utils.objectattributes.attributable.AttributesImpl;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverProduct.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverProduct.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverProduct.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverProduct.java
index 40489f44c23..5e734d77247 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverProduct.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverProduct.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
/**
* Returns a new instance of a receiver product with associated information,
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverReplanningType.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverReplanningType.java
similarity index 96%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverReplanningType.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverReplanningType.java
index d8bd5df43dc..f1845f3d2cb 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverReplanningType.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverReplanningType.java
@@ -15,7 +15,7 @@
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
public enum ReceiverReplanningType {
serviceTime, timeWindow, orderFrequency, afterHoursTimeWindow
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoreStats.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoreStats.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoreStats.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoreStats.java
index a9a63491a07..a6b260fc449 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoreStats.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoreStats.java
@@ -1,11 +1,11 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import com.google.inject.Inject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.matsim.api.core.v01.Scenario;
import org.matsim.freight.carriers.CarriersUtils;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.controler.events.IterationEndsEvent;
import org.matsim.core.controler.events.ShutdownEvent;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoringFunctionFactory.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoringFunctionFactory.java
similarity index 97%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoringFunctionFactory.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoringFunctionFactory.java
index 81e60676e02..ade37d5354e 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoringFunctionFactory.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoringFunctionFactory.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.core.scoring.ScoringFunction;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoringFunctionFactoryMoneyOnly.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoringFunctionFactoryMoneyOnly.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoringFunctionFactoryMoneyOnly.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoringFunctionFactoryMoneyOnly.java
index 57357050ebb..e937074d616 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverScoringFunctionFactoryMoneyOnly.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverScoringFunctionFactoryMoneyOnly.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.matsim.core.scoring.ScoringFunction;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTracker.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverTracker.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTracker.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverTracker.java
index a03dc19cf06..e1fd6bc7ef5 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTracker.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverTracker.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverTriggersCarrierReplanningListener.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverTriggersCarrierReplanningListener.java
index 62a2a507aa2..2b8c4a6dfb9 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverTriggersCarrierReplanningListener.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverTriggersCarrierReplanningListener.java
@@ -15,7 +15,7 @@
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm;
import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem;
@@ -29,7 +29,7 @@
import org.matsim.freight.carriers.jsprit.MatsimJspritFactory;
import org.matsim.freight.carriers.jsprit.NetworkBasedTransportCosts;
import org.matsim.freight.carriers.jsprit.NetworkRouter;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.controler.events.IterationStartsEvent;
import org.matsim.core.controler.listener.IterationStartsListener;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverUtils.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverUtils.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverUtils.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverUtils.java
index dcd2861daed..e9b1b293368 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiverUtils.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiverUtils.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Receivers.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Receivers.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Receivers.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Receivers.java
index 3d042480928..640aa31d6b8 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/Receivers.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/Receivers.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReader.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversReader.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReader.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversReader.java
index 63afdf1c4cd..1c68dd3dbfe 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReader.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversReader.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.core.utils.io.MatsimXmlParser;
import org.xml.sax.Attributes;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReaderV2.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversReaderV2.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReaderV2.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversReaderV2.java
index 2036326c078..b886be795f8 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversReaderV2.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversReaderV2.java
@@ -18,13 +18,13 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.network.Link;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.TimeWindow;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
import org.matsim.core.api.internal.MatsimReader;
import org.matsim.core.utils.io.MatsimXmlParser;
import org.matsim.core.utils.misc.Counter;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriter.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriter.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriter.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriter.java
index cd9e2f33a06..68b37813398 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriter.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriter.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandler.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandler.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandler.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandler.java
index 09172159e06..1ceacde5d4b 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandler.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandler.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.freight.carriers.TimeWindow;
import java.io.BufferedWriter;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV1.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandlerImplV1.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV1.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandlerImplV1.java
index ecc7b58f43e..4e5a4b2e262 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV1.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandlerImplV1.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.freight.carriers.TimeWindow;
import org.matsim.core.utils.misc.Time;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV2.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandlerImplV2.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV2.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandlerImplV2.java
index c2b8fe50f1b..b9091c62111 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReceiversWriterHandlerImplV2.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReceiversWriterHandlerImplV2.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.freight.carriers.TimeWindow;
import org.matsim.core.utils.misc.Time;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReorderPolicy.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReorderPolicy.java
similarity index 97%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReorderPolicy.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReorderPolicy.java
index e04152e5e30..9447bb3b8bc 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/ReorderPolicy.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/ReorderPolicy.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.utils.objectattributes.attributable.Attributable;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/SSReorderPolicy.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/SSReorderPolicy.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/SSReorderPolicy.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/SSReorderPolicy.java
index 9928bbc6191..f9620ef58b2 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/SSReorderPolicy.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/SSReorderPolicy.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.matsim.utils.objectattributes.attributable.Attributes;
import org.matsim.utils.objectattributes.attributable.AttributesImpl;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/UsecasesCarrierScoringFunctionFactory.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/UsecasesCarrierScoringFunctionFactory.java
similarity index 99%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/UsecasesCarrierScoringFunctionFactory.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/UsecasesCarrierScoringFunctionFactory.java
index 5cc872f2b50..f1287ff4de3 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/UsecasesCarrierScoringFunctionFactory.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/UsecasesCarrierScoringFunctionFactory.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/Coalition.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/Coalition.java
similarity index 86%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/Coalition.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/Coalition.java
index 9afea8cdc9e..77e28d853e6 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/Coalition.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/Coalition.java
@@ -1,7 +1,7 @@
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
import org.matsim.freight.carriers.Carrier;
-import org.matsim.contrib.freightreceiver.Receiver;
+import org.matsim.freight.receiver.Receiver;
import org.matsim.utils.objectattributes.attributable.Attributable;
import java.util.Collection;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtils.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/CollaborationUtils.java
similarity index 97%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtils.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/CollaborationUtils.java
index 25e73445613..3775eec413b 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtils.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/CollaborationUtils.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -7,7 +7,7 @@
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.CarriersUtils;
import org.matsim.freight.carriers.Carriers;
-import org.matsim.contrib.freightreceiver.*;
+import org.matsim.freight.receiver.*;
public class CollaborationUtils{
private CollaborationUtils(){} // do not instantiate
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtilsNew.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/CollaborationUtilsNew.java
similarity index 70%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtilsNew.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/CollaborationUtilsNew.java
index c3c3d3d544e..68576dc0ea3 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/CollaborationUtilsNew.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/CollaborationUtilsNew.java
@@ -1,7 +1,7 @@
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
import org.matsim.freight.carriers.Carriers;
-import org.matsim.contrib.freightreceiver.*;
+import org.matsim.freight.receiver.Receivers;
/**
* Class with utilities to handle the collaboration between {@link Carriers}
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/MutableCoalition.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/MutableCoalition.java
similarity index 93%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/MutableCoalition.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/MutableCoalition.java
index 4799f493912..c6597ff695d 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/MutableCoalition.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/MutableCoalition.java
@@ -1,8 +1,8 @@
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
import org.matsim.freight.carriers.Carrier;
-import org.matsim.contrib.freightreceiver.Receiver;
+import org.matsim.freight.receiver.Receiver;
import org.matsim.utils.objectattributes.attributable.Attributes;
import org.matsim.utils.objectattributes.attributable.AttributesImpl;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/OrderSizeMutator.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/OrderSizeMutator.java
similarity index 93%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/OrderSizeMutator.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/OrderSizeMutator.java
index 99b91c04395..118f6ed3b84 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/OrderSizeMutator.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/OrderSizeMutator.java
@@ -16,11 +16,11 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
-import org.matsim.contrib.freightreceiver.Order;
-import org.matsim.contrib.freightreceiver.ReceiverOrder;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.Order;
+import org.matsim.freight.receiver.ReceiverOrder;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.gbl.MatsimRandom;
import org.matsim.core.replanning.ReplanningContext;
import org.matsim.core.replanning.modules.GenericPlanStrategyModule;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/TimeWindowMutator.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/TimeWindowMutator.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/TimeWindowMutator.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/TimeWindowMutator.java
index bf972b057fe..abd734db026 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/collaboration/TimeWindowMutator.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/collaboration/TimeWindowMutator.java
@@ -19,10 +19,10 @@
/**
*
*/
-package org.matsim.contrib.freightreceiver.collaboration;
+package org.matsim.freight.receiver.collaboration;
import org.matsim.freight.carriers.TimeWindow;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.gbl.MatsimRandom;
import org.matsim.core.replanning.ReplanningContext;
import org.matsim.core.replanning.modules.GenericPlanStrategyModule;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/multiday/MultidayUtils.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/multiday/MultidayUtils.java
similarity index 89%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/multiday/MultidayUtils.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/multiday/MultidayUtils.java
index 46fad091944..b5aad6ea53a 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/multiday/MultidayUtils.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/multiday/MultidayUtils.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver.multiday;
+package org.matsim.freight.receiver.multiday;
import org.matsim.core.utils.misc.OptionalTime;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/CollaborationStatusMutator.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/CollaborationStatusMutator.java
similarity index 88%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/CollaborationStatusMutator.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/CollaborationStatusMutator.java
index 018a8f64c87..caa840d48c1 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/CollaborationStatusMutator.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/CollaborationStatusMutator.java
@@ -1,9 +1,9 @@
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.ReceiverPlan;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
import org.matsim.core.replanning.ReplanningContext;
import org.matsim.core.replanning.modules.GenericPlanStrategyModule;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/OrderFrequencyStrategyManager.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/OrderFrequencyStrategyManager.java
similarity index 91%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/OrderFrequencyStrategyManager.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/OrderFrequencyStrategyManager.java
index f74750d9924..eb14b8eeb22 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/OrderFrequencyStrategyManager.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/OrderFrequencyStrategyManager.java
@@ -1,11 +1,11 @@
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freightreceiver.Receiver;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
-import org.matsim.contrib.freightreceiver.collaboration.OrderSizeMutator;
+import org.matsim.freight.receiver.Receiver;
+import org.matsim.freight.receiver.ReceiverPlan;
+import org.matsim.freight.receiver.collaboration.OrderSizeMutator;
import org.matsim.core.replanning.GenericPlanStrategyImpl;
import org.matsim.core.replanning.selectors.ExpBetaPlanChanger;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverReplanningUtils.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverReplanningUtils.java
similarity index 81%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverReplanningUtils.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverReplanningUtils.java
index 2bdc4eadbb7..71309261c26 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverReplanningUtils.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverReplanningUtils.java
@@ -1,7 +1,7 @@
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import com.google.inject.Provider;
-import org.matsim.contrib.freightreceiver.ReceiverReplanningType;
+import org.matsim.freight.receiver.ReceiverReplanningType;
/**
* A single entry point for receiver replanning.
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverStrategyManager.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverStrategyManager.java
similarity index 88%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverStrategyManager.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverStrategyManager.java
index 0ef128e441a..f10d7d98145 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverStrategyManager.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverStrategyManager.java
@@ -18,11 +18,11 @@
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import org.matsim.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.contrib.freightreceiver.Receiver;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.Receiver;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.replanning.GenericStrategyManager;
/**
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverStrategyManagerImpl.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverStrategyManagerImpl.java
similarity index 94%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverStrategyManagerImpl.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverStrategyManagerImpl.java
index 4b56bee4470..c164c64a039 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ReceiverStrategyManagerImpl.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ReceiverStrategyManagerImpl.java
@@ -18,11 +18,11 @@
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import org.matsim.api.core.v01.population.HasPlansAndId;
-import org.matsim.contrib.freightreceiver.Receiver;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.Receiver;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.replanning.GenericPlanStrategy;
import org.matsim.core.replanning.GenericStrategyManager;
import org.matsim.core.replanning.GenericStrategyManagerImpl;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ServiceTimeMutator.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ServiceTimeMutator.java
similarity index 93%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ServiceTimeMutator.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ServiceTimeMutator.java
index 842ad6c5584..7488cc3e748 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ServiceTimeMutator.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ServiceTimeMutator.java
@@ -16,13 +16,13 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
-import org.matsim.contrib.freightreceiver.Order;
-import org.matsim.contrib.freightreceiver.ReceiverOrder;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.Order;
+import org.matsim.freight.receiver.ReceiverOrder;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.replanning.ReplanningContext;
import org.matsim.core.replanning.modules.GenericPlanStrategyModule;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ServiceTimeStrategyManagerProvider.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ServiceTimeStrategyManagerProvider.java
similarity index 95%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ServiceTimeStrategyManagerProvider.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ServiceTimeStrategyManagerProvider.java
index 6271e402b57..c88b09a261d 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/ServiceTimeStrategyManagerProvider.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/ServiceTimeStrategyManagerProvider.java
@@ -1,10 +1,10 @@
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freightreceiver.Receiver;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.Receiver;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.replanning.GenericPlanStrategy;
import org.matsim.core.replanning.GenericPlanStrategyImpl;
import org.matsim.core.replanning.selectors.ExpBetaPlanChanger;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowStrategyManagerFactory.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/TimeWindowStrategyManagerFactory.java
similarity index 92%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowStrategyManagerFactory.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/TimeWindowStrategyManagerFactory.java
index e19d1437dc0..87926d796a2 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowStrategyManagerFactory.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/TimeWindowStrategyManagerFactory.java
@@ -1,13 +1,13 @@
/**
*
*/
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freightreceiver.Receiver;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.Receiver;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.replanning.GenericPlanStrategyImpl;
import org.matsim.core.replanning.selectors.ExpBetaPlanChanger;
import org.matsim.core.utils.misc.Time;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowUpperBoundMutator.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/TimeWindowUpperBoundMutator.java
similarity index 97%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowUpperBoundMutator.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/TimeWindowUpperBoundMutator.java
index 97ea20b2e20..553504a7862 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/replanning/TimeWindowUpperBoundMutator.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/replanning/TimeWindowUpperBoundMutator.java
@@ -16,10 +16,10 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver.replanning;
+package org.matsim.freight.receiver.replanning;
import org.matsim.freight.carriers.TimeWindow;
-import org.matsim.contrib.freightreceiver.ReceiverPlan;
+import org.matsim.freight.receiver.ReceiverPlan;
import org.matsim.core.gbl.MatsimRandom;
import org.matsim.core.replanning.ReplanningContext;
import org.matsim.core.replanning.modules.GenericPlanStrategyModule;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardParameters.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/ReceiverChessboardParameters.java
similarity index 94%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardParameters.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/ReceiverChessboardParameters.java
index b5b946942b0..327c65716d6 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardParameters.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/ReceiverChessboardParameters.java
@@ -16,9 +16,9 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver.run.chessboard;
+package org.matsim.freight.receiver.run.chessboard;
-import org.matsim.contrib.freightreceiver.ReceiverReplanningType;
+import org.matsim.freight.receiver.ReceiverReplanningType;
/**
* Class to help with setting experimental parameters. These parameters are
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardScenario.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/ReceiverChessboardScenario.java
similarity index 98%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardScenario.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/ReceiverChessboardScenario.java
index b5b2f535b45..fd036695370 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/ReceiverChessboardScenario.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/ReceiverChessboardScenario.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver.run.chessboard;
+package org.matsim.freight.receiver.run.chessboard;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -29,8 +29,8 @@
import org.matsim.api.core.v01.network.NetworkWriter;
import org.matsim.freight.carriers.*;
import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
-import org.matsim.contrib.freightreceiver.*;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.*;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
import org.matsim.core.config.Config;
import org.matsim.core.config.ConfigUtils;
import org.matsim.core.config.ConfigWriter;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java
similarity index 93%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java
index 469f45574ee..4e7b9b2607a 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/RunReceiverChessboardWithEqualProportionCost.java
@@ -18,7 +18,7 @@
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver.run.chessboard;
+package org.matsim.freight.receiver.run.chessboard;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -26,9 +26,9 @@
import org.matsim.freight.carriers.CarriersUtils;
import org.matsim.freight.carriers.Carriers;
import org.matsim.freight.carriers.usecases.analysis.CarrierScoreStats;
-import org.matsim.contrib.freightreceiver.ReceiverModule;
-import org.matsim.contrib.freightreceiver.ReceiverReplanningType;
-import org.matsim.contrib.freightreceiver.ReceiverUtils;
+import org.matsim.freight.receiver.ReceiverModule;
+import org.matsim.freight.receiver.ReceiverReplanningType;
+import org.matsim.freight.receiver.ReceiverUtils;
import org.matsim.core.controler.Controler;
import org.matsim.core.controler.MatsimServices;
diff --git a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java
similarity index 93%
rename from contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java
rename to contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java
index 112785c45b8..2570eb80c16 100644
--- a/contribs/freightreceiver/src/main/java/org/matsim/contrib/freightreceiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java
+++ b/contribs/freightreceiver/src/main/java/org/matsim/freight/receiver/run/chessboard/RunReceiverChessboardWithFixedCarrierCost.java
@@ -18,7 +18,7 @@
* ***********************************************************************
*/
-package org.matsim.contrib.freightreceiver.run.chessboard;
+package org.matsim.freight.receiver.run.chessboard;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -26,9 +26,9 @@
import org.matsim.freight.carriers.CarriersUtils;
import org.matsim.freight.carriers.Carriers;
import org.matsim.freight.carriers.usecases.analysis.CarrierScoreStats;
-import org.matsim.contrib.freightreceiver.ReceiverModule;
-import org.matsim.contrib.freightreceiver.ReceiverReplanningType;
-import org.matsim.contrib.freightreceiver.ReceiverUtils;
+import org.matsim.freight.receiver.ReceiverModule;
+import org.matsim.freight.receiver.ReceiverReplanningType;
+import org.matsim.freight.receiver.ReceiverUtils;
import org.matsim.core.controler.Controler;
import org.matsim.core.controler.MatsimServices;
diff --git a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixedTest.java b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiverCostAllocationFixedTest.java
similarity index 88%
rename from contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixedTest.java
rename to contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiverCostAllocationFixedTest.java
index 8faf02fd1c0..4189a6e9779 100644
--- a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiverCostAllocationFixedTest.java
+++ b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiverCostAllocationFixedTest.java
@@ -1,4 +1,4 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiverPlanTest.java b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiverPlanTest.java
similarity index 97%
rename from contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiverPlanTest.java
rename to contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiverPlanTest.java
index 9933bda39d7..ea784499f81 100644
--- a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiverPlanTest.java
+++ b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiverPlanTest.java
@@ -16,7 +16,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.matsim.api.core.v01.Id;
diff --git a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversReaderTest.java b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversReaderTest.java
similarity index 98%
rename from contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversReaderTest.java
rename to contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversReaderTest.java
index 970641df24e..6a893a9409f 100644
--- a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversReaderTest.java
+++ b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversReaderTest.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -26,7 +26,7 @@
import org.matsim.api.core.v01.Id;
import org.matsim.freight.carriers.Carrier;
import org.matsim.freight.carriers.TimeWindow;
-import org.matsim.contrib.freightreceiver.collaboration.CollaborationUtils;
+import org.matsim.freight.receiver.collaboration.CollaborationUtils;
import org.matsim.core.utils.misc.Time;
import org.matsim.testcases.MatsimTestUtils;
diff --git a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversTest.java b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversTest.java
similarity index 97%
rename from contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversTest.java
rename to contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversTest.java
index 35dbed33c31..8ca84ad87f8 100644
--- a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversTest.java
+++ b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversTest.java
@@ -1,11 +1,11 @@
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Id;
import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freightreceiver.run.chessboard.ReceiverChessboardScenario;
+import org.matsim.freight.receiver.run.chessboard.ReceiverChessboardScenario;
import org.matsim.testcases.MatsimTestUtils;
import java.util.Collection;
diff --git a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversWriterTest.java b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversWriterTest.java
similarity index 96%
rename from contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversWriterTest.java
rename to contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversWriterTest.java
index 34a66898d68..1f9a453ce08 100644
--- a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/ReceiversWriterTest.java
+++ b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/ReceiversWriterTest.java
@@ -18,13 +18,13 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freightreceiver.run.chessboard.ReceiverChessboardScenario;
+import org.matsim.freight.receiver.run.chessboard.ReceiverChessboardScenario;
import org.matsim.testcases.MatsimTestUtils;
import java.io.File;
diff --git a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/SSReorderPolicyTest.java b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/SSReorderPolicyTest.java
similarity index 97%
rename from contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/SSReorderPolicyTest.java
rename to contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/SSReorderPolicyTest.java
index 1841ae963fc..c22aea6a54b 100644
--- a/contribs/freightreceiver/src/test/java/org/matsim/contrib/freightreceiver/SSReorderPolicyTest.java
+++ b/contribs/freightreceiver/src/test/java/org/matsim/freight/receiver/SSReorderPolicyTest.java
@@ -18,7 +18,7 @@
* *
* *********************************************************************** */
-package org.matsim.contrib.freightreceiver;
+package org.matsim.freight.receiver;
import org.junit.jupiter.api.Assertions;
diff --git a/contribs/freightreceiver/test/input/org/matsim/contrib/freightreceiver/ReceiversReaderTest/receivers_v2_basic.xml b/contribs/freightreceiver/test/input/org/matsim/freight/receiver/ReceiversReaderTest/receivers_v2_basic.xml
similarity index 100%
rename from contribs/freightreceiver/test/input/org/matsim/contrib/freightreceiver/ReceiversReaderTest/receivers_v2_basic.xml
rename to contribs/freightreceiver/test/input/org/matsim/freight/receiver/ReceiversReaderTest/receivers_v2_basic.xml
diff --git a/contribs/freightreceiver/test/input/org/matsim/contrib/freightreceiver/ReceiversReaderTest/receivers_v2_full.xml b/contribs/freightreceiver/test/input/org/matsim/freight/receiver/ReceiversReaderTest/receivers_v2_full.xml
similarity index 100%
rename from contribs/freightreceiver/test/input/org/matsim/contrib/freightreceiver/ReceiversReaderTest/receivers_v2_full.xml
rename to contribs/freightreceiver/test/input/org/matsim/freight/receiver/ReceiversReaderTest/receivers_v2_full.xml
diff --git a/contribs/freightreceiver/test/input/org/matsim/contrib/freightreceiver/ReceiversTest/receivers_v2.xml b/contribs/freightreceiver/test/input/org/matsim/freight/receiver/ReceiversTest/receivers_v2.xml
similarity index 100%
rename from contribs/freightreceiver/test/input/org/matsim/contrib/freightreceiver/ReceiversTest/receivers_v2.xml
rename to contribs/freightreceiver/test/input/org/matsim/freight/receiver/ReceiversTest/receivers_v2.xml
diff --git a/contribs/hybridsim/pom.xml b/contribs/hybridsim/pom.xml
index d8f69b28046..7bb94a4feff 100644
--- a/contribs/hybridsim/pom.xml
+++ b/contribs/hybridsim/pom.xml
@@ -11,7 +11,7 @@
4.28.3
- 1.66.0
+ 1.68.1