remove "contrib" from package name.

matsim-vsp · Oct 12, 2023 · abce2dd · abce2dd
1 parent 9052bb1
commit abce2dd
Show file tree

Hide file tree

Showing 108 changed files with 306 additions and 306 deletions.
diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfInitialPlan.java
@@ -30,8 +30,8 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.config.Config;
 import org.matsim.core.network.io.MatsimNetworkReader;
 import org.matsim.core.scenario.ScenarioUtils;

diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChain.java
@@ -33,8 +33,8 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.config.Config;
 import org.matsim.core.network.io.MatsimNetworkReader;
 import org.matsim.core.scenario.ScenarioUtils;

diff --git a/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java b/src/main/java/example/lsp/initialPlans/ExampleSchedulingOfTransportChainHubsVsDirect.java
@@ -34,14 +34,14 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent;
-import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourEndEventHandler;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.events.CarrierServiceEndEvent;
+import org.matsim.freight.carriers.events.CarrierTourEndEvent;
+import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
+import org.matsim.freight.carriers.events.eventhandler.FreightTourEndEventHandler;
 import org.matsim.core.config.CommandLine;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;

diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid.java
@@ -33,10 +33,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
 import org.matsim.core.config.CommandLine;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;

diff --git a/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java b/src/main/java/example/lsp/initialPlans/ExampleTwoEchelonGrid_NR.java
@@ -35,10 +35,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
 import org.matsim.core.config.CommandLine;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;

diff --git a/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java b/src/main/java/example/lsp/initialPlans/MyCarrierScorer.java
@@ -1,7 +1,7 @@
 package example.lsp.initialPlans;
 
-import org.matsim.contrib.freight.carriers.Carrier;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.Carrier;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
 import org.matsim.core.scoring.ScoringFunction;
 import org.matsim.core.scoring.SumScoringFunction;
 

diff --git a/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java b/src/main/java/example/lsp/initialPlans/MyEventBasedCarrierScorer.java
@@ -8,11 +8,11 @@
 import org.matsim.api.core.v01.events.Event;
 import org.matsim.api.core.v01.events.LinkEnterEvent;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.Carrier;
-import org.matsim.contrib.freight.carriers.Tour;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent;
-import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent;
+import org.matsim.freight.carriers.Carrier;
+import org.matsim.freight.carriers.Tour;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.events.CarrierTourEndEvent;
+import org.matsim.freight.carriers.events.CarrierTourStartEvent;
 import org.matsim.core.scoring.ScoringFunction;
 import org.matsim.core.scoring.SumScoringFunction;
 import org.matsim.vehicles.Vehicle;

diff --git a/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java b/src/main/java/example/lsp/lspReplanning/ExampleLSPReplanning.java
@@ -30,8 +30,8 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;
 import org.matsim.core.controler.AbstractModule;

diff --git a/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java b/src/main/java/example/lsp/lspScoring/ExampleLSPScoring.java
@@ -31,10 +31,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
-import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.events.CarrierServiceEndEvent;
+import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;

diff --git a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfSimpleLSP.java
@@ -30,8 +30,8 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;

diff --git a/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java b/src/main/java/example/lsp/mobsimExamples/ExampleMobsimOfTransportChain.java
@@ -33,8 +33,8 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;
 import org.matsim.core.controler.AbstractModule;

diff --git a/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java b/src/main/java/example/lsp/multipleChains/EventBasedCarrierScorer_MultipleChains.java
@@ -8,11 +8,11 @@
 import org.matsim.api.core.v01.events.Event;
 import org.matsim.api.core.v01.events.LinkEnterEvent;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.Carrier;
-import org.matsim.contrib.freight.carriers.Tour;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.events.CarrierTourEndEvent;
-import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent;
+import org.matsim.freight.carriers.Carrier;
+import org.matsim.freight.carriers.Tour;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.events.CarrierTourEndEvent;
+import org.matsim.freight.carriers.events.CarrierTourStartEvent;
 import org.matsim.core.scoring.ScoringFunction;
 import org.matsim.core.scoring.SumScoringFunction;
 import org.matsim.vehicles.Vehicle;

diff --git a/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java b/src/main/java/example/lsp/multipleChains/ExampleGroceryDeliveryMultipleChains.java
@@ -11,10 +11,10 @@
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.PlanCalcScoreConfigGroup;

diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleMixedEchelonChains.java
@@ -13,10 +13,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;

diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChains.java
@@ -11,10 +11,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;

diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleOneEchelonChainsReplanning.java
@@ -11,10 +11,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.PlanCalcScoreConfigGroup;

diff --git a/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java b/src/main/java/example/lsp/multipleChains/ExampleMultipleTwoEchelonChainsReplanning.java
@@ -13,10 +13,10 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.controler.CarrierScoringFunctionFactory;
-import org.matsim.contrib.freight.carriers.controler.CarrierStrategyManager;
-import org.matsim.contrib.freight.carriers.controler.CarrierControlerUtils;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.controler.CarrierScoringFunctionFactory;
+import org.matsim.freight.carriers.controler.CarrierStrategyManager;
+import org.matsim.freight.carriers.controler.CarrierControlerUtils;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.config.groups.PlanCalcScoreConfigGroup;

diff --git a/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java b/src/main/java/example/lsp/multipleChains/MultipleChainsUtils.java
@@ -3,8 +3,8 @@
 import lsp.shipment.LSPShipment;
 import lsp.shipment.ShipmentUtils;
 import org.matsim.api.core.v01.Id;
-import org.matsim.contrib.freight.carriers.Carrier;
-import org.matsim.contrib.freight.carriers.CarrierShipment;
+import org.matsim.freight.carriers.Carrier;
+import org.matsim.freight.carriers.CarrierShipment;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java b/src/main/java/example/lsp/simulationTrackers/CollectionServiceHandler.java
@@ -22,11 +22,11 @@
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freight.carriers.CarrierService;
-import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent;
-import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceStartEventHandler;
+import org.matsim.freight.carriers.CarrierService;
+import org.matsim.freight.carriers.events.CarrierServiceEndEvent;
+import org.matsim.freight.carriers.events.CarrierServiceStartEvent;
+import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
+import org.matsim.freight.carriers.events.eventhandler.FreightServiceStartEventHandler;
 import org.matsim.vehicles.Vehicle;
 import org.matsim.vehicles.VehicleUtils;
 import org.matsim.vehicles.Vehicles;

diff --git a/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java b/src/main/java/example/lsp/simulationTrackers/ExampleSimulationTrackers.java
@@ -29,8 +29,8 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.groups.VspExperimentalConfigGroup;
 import org.matsim.core.controler.Controler;

diff --git a/src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java b/src/main/java/example/lsp/simulationTrackers/LinearCostTracker.java
@@ -29,12 +29,12 @@
 import org.matsim.api.core.v01.events.handler.LinkEnterEventHandler;
 import org.matsim.api.core.v01.events.handler.LinkLeaveEventHandler;
 import org.matsim.api.core.v01.events.handler.VehicleLeavesTrafficEventHandler;
-import org.matsim.contrib.freight.carriers.events.CarrierServiceEndEvent;
-import org.matsim.contrib.freight.carriers.events.CarrierServiceStartEvent;
-import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightServiceStartEventHandler;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler;
+import org.matsim.freight.carriers.events.CarrierServiceEndEvent;
+import org.matsim.freight.carriers.events.CarrierServiceStartEvent;
+import org.matsim.freight.carriers.events.CarrierTourStartEvent;
+import org.matsim.freight.carriers.events.eventhandler.FreightServiceEndEventHandler;
+import org.matsim.freight.carriers.events.eventhandler.FreightServiceStartEventHandler;
+import org.matsim.freight.carriers.events.eventhandler.FreightTourStartEventHandler;
 import org.matsim.core.controler.events.AfterMobsimEvent;
 import org.matsim.core.controler.listener.AfterMobsimListener;
 import org.matsim.core.events.handler.EventHandler;

diff --git a/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java b/src/main/java/example/lsp/simulationTrackers/TourStartHandler.java
@@ -23,9 +23,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.events.CarrierTourStartEvent;
-import org.matsim.contrib.freight.carriers.events.eventhandler.FreightTourStartEventHandler;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.events.CarrierTourStartEvent;
+import org.matsim.freight.carriers.events.eventhandler.FreightTourStartEventHandler;
 
 import java.util.Collection;
 

diff --git a/...in/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java b/...in/java/example/lspAndDemand/requirementsChecking/ExampleCheckRequirementsOfAssigner.java
@@ -29,8 +29,8 @@
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.api.core.v01.network.Network;
-import org.matsim.contrib.freight.carriers.*;
-import org.matsim.contrib.freight.carriers.CarrierCapabilities.FleetSize;
+import org.matsim.freight.carriers.*;
+import org.matsim.freight.carriers.CarrierCapabilities.FleetSize;
 import org.matsim.core.config.Config;
 import org.matsim.core.network.io.MatsimNetworkReader;
 import org.matsim.core.scenario.ScenarioUtils;

diff --git a/src/main/java/lsp/LSPCarrierResource.java b/src/main/java/lsp/LSPCarrierResource.java
@@ -20,7 +20,7 @@
 
 package lsp;
 
-import org.matsim.contrib.freight.carriers.Carrier;
+import org.matsim.freight.carriers.Carrier;
 
 public interface LSPCarrierResource extends LSPResource {
 

diff --git a/src/main/java/lsp/LSPControlerListener.java b/src/main/java/lsp/LSPControlerListener.java
@@ -27,11 +27,11 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freight.carriers.Carrier;
-import org.matsim.contrib.freight.carriers.CarrierPlanWriter;
-import org.matsim.contrib.freight.carriers.CarrierUtils;
-import org.matsim.contrib.freight.carriers.Carriers;
-import org.matsim.contrib.freight.carriers.controler.CarrierAgentTracker;
+import org.matsim.freight.carriers.Carrier;
+import org.matsim.freight.carriers.CarrierPlanWriter;
+import org.matsim.freight.carriers.CarrierUtils;
+import org.matsim.freight.carriers.Carriers;
+import org.matsim.freight.carriers.controler.CarrierAgentTracker;
 import org.matsim.core.api.experimental.events.EventsManager;
 import org.matsim.core.controler.MatsimServices;
 import org.matsim.core.controler.OutputDirectoryHierarchy;

diff --git a/src/main/java/lsp/LSPModule.java b/src/main/java/lsp/LSPModule.java
@@ -30,10 +30,9 @@
 import org.matsim.api.core.v01.population.Activity;
 import org.matsim.api.core.v01.population.HasPlansAndId;
 import org.matsim.api.core.v01.population.Leg;
-import org.matsim.contrib.freight.carriers.FreightCarriersConfigGroup;
-import org.matsim.contrib.freight.carriers.Carrier;
-import org.matsim.contrib.freight.carriers.Carriers;
-import org.matsim.contrib.freight.carriers.controler.*;
+import org.matsim.freight.carriers.FreightCarriersConfigGroup;
+import org.matsim.freight.carriers.Carrier;
+import org.matsim.freight.carriers.Carriers;
 import org.matsim.core.config.ConfigUtils;
 import org.matsim.core.controler.AbstractModule;
 import org.matsim.core.controler.events.BeforeMobsimEvent;
@@ -44,6 +43,7 @@
 import org.matsim.core.replanning.ReplanningContext;
 import org.matsim.core.replanning.selectors.PlanSelector;
 import org.matsim.core.scoring.ScoringFunction;
+import org.matsim.freight.carriers.controler.*;
 
 import java.util.List;
 

diff --git a/src/main/java/lsp/LSPScorer.java b/src/main/java/lsp/LSPScorer.java
@@ -21,7 +21,7 @@
 package lsp;
 
 import org.matsim.api.core.v01.population.Activity;
-import org.matsim.contrib.freight.carriers.Carrier;
+import org.matsim.freight.carriers.Carrier;
 import org.matsim.core.controler.listener.ControlerListener;
 import org.matsim.core.events.handler.EventHandler;
 import org.matsim.core.scoring.ScoringFunction;

diff --git a/src/main/java/lsp/LSPUtils.java b/src/main/java/lsp/LSPUtils.java
@@ -24,8 +24,8 @@
 import lsp.shipment.ShipmentPlan;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
-import org.matsim.contrib.freight.carriers.CarrierUtils;
-import org.matsim.contrib.freight.carriers.Carriers;
+import org.matsim.freight.carriers.CarrierUtils;
+import org.matsim.freight.carriers.Carriers;
 import org.matsim.utils.objectattributes.attributable.Attributable;
 
 import java.util.ArrayList;