diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolMonitorV5.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolMonitorV5.java
index a5659aaf05f..629a98c02c0 100644
--- a/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolMonitorV5.java
+++ b/modules/dcache/src/main/java/diskCacheV111/poolManager/PoolMonitorV5.java
@@ -29,7 +29,6 @@
 import diskCacheV111.poolManager.PoolSelectionUnit.SelectionPool;
 import diskCacheV111.pools.PoolCostInfo;
 import diskCacheV111.util.CacheException;
-import diskCacheV111.util.CostException;
 import diskCacheV111.util.FileLocality;
 import diskCacheV111.util.FileNotInCacheException;
 import diskCacheV111.util.FileNotOnlineCacheException;
@@ -39,6 +38,7 @@
 
 import org.dcache.namespace.FileAttribute;
 import org.dcache.namespace.FileType;
+import org.dcache.poolmanager.CostException;
 import org.dcache.poolmanager.Partition;
 import org.dcache.poolmanager.PartitionManager;
 import org.dcache.poolmanager.PoolInfo;
@@ -49,9 +49,7 @@
 
 import static com.google.common.base.Strings.nullToEmpty;
 import static java.util.stream.Collectors.toList;
-import static org.dcache.namespace.FileAttribute.LOCATIONS;
-import static org.dcache.namespace.FileAttribute.SIZE;
-import static org.dcache.namespace.FileAttribute.STORAGEINFO;
+import static org.dcache.namespace.FileAttribute.*;
 
 public class PoolMonitorV5
     extends SerializablePoolMonitor
diff --git a/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java b/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java
index 7923f8a96b6..d0e95eeca84 100644
--- a/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java
+++ b/modules/dcache/src/main/java/diskCacheV111/poolManager/RequestContainerV5.java
@@ -35,7 +35,6 @@
 
 import diskCacheV111.util.CacheException;
 import diskCacheV111.util.CheckStagePermission;
-import diskCacheV111.util.CostException;
 import diskCacheV111.util.DestinationCostException;
 import diskCacheV111.util.FileNotInCacheException;
 import diskCacheV111.util.PermissionDeniedCacheException;
@@ -72,6 +71,7 @@
 import dmg.util.command.Command;
 
 import org.dcache.cells.CellStub;
+import org.dcache.poolmanager.CostException;
 import org.dcache.poolmanager.Partition;
 import org.dcache.poolmanager.PartitionManager;
 import org.dcache.poolmanager.PoolInfo;
@@ -83,10 +83,11 @@
 import org.dcache.vehicles.FileAttributes;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static diskCacheV111.poolManager.RequestContainerV5.StateType.TRANSITORY;
+import static diskCacheV111.poolManager.RequestContainerV5.StateType.WAITING;
 import static dmg.util.CommandException.checkCommand;
-import static java.util.stream.Collectors.toList;
-import static diskCacheV111.poolManager.RequestContainerV5.StateType.*;
 import static java.util.Objects.requireNonNull;
+import static java.util.stream.Collectors.toList;
 import static org.dcache.util.MathUtils.addWithInfinity;
 
 public class RequestContainerV5
diff --git a/modules/dcache/src/main/java/org/dcache/poolmanager/ClassicPartition.java b/modules/dcache/src/main/java/org/dcache/poolmanager/ClassicPartition.java
index 065b8d3c76f..e63192b52dd 100644
--- a/modules/dcache/src/main/java/org/dcache/poolmanager/ClassicPartition.java
+++ b/modules/dcache/src/main/java/org/dcache/poolmanager/ClassicPartition.java
@@ -12,7 +12,6 @@
 
 import diskCacheV111.poolManager.CostModule;
 import diskCacheV111.util.CacheException;
-import diskCacheV111.util.CostException;
 import diskCacheV111.util.PnfsId;
 
 import org.dcache.pool.assumption.PerformanceCostAssumption;
diff --git a/modules/dcache-vehicles/src/main/java/diskCacheV111/util/CostException.java b/modules/dcache/src/main/java/org/dcache/poolmanager/CostException.java
similarity index 94%
rename from modules/dcache-vehicles/src/main/java/diskCacheV111/util/CostException.java
rename to modules/dcache/src/main/java/org/dcache/poolmanager/CostException.java
index 75be0e9da4e..798b8ebf984 100644
--- a/modules/dcache-vehicles/src/main/java/diskCacheV111/util/CostException.java
+++ b/modules/dcache/src/main/java/org/dcache/poolmanager/CostException.java
@@ -1,4 +1,6 @@
-package diskCacheV111.util;
+package org.dcache.poolmanager;
+
+import diskCacheV111.util.MissingResourceCacheException;
 
 import org.dcache.poolmanager.SelectedPool;
 
diff --git a/modules/dcache/src/main/java/org/dcache/poolmanager/LruPartition.java b/modules/dcache/src/main/java/org/dcache/poolmanager/LruPartition.java
index ceace41507f..5bb8d7038ae 100644
--- a/modules/dcache/src/main/java/org/dcache/poolmanager/LruPartition.java
+++ b/modules/dcache/src/main/java/org/dcache/poolmanager/LruPartition.java
@@ -12,7 +12,6 @@
 import diskCacheV111.poolManager.CostModule;
 import diskCacheV111.pools.PoolCostInfo.PoolSpaceInfo;
 import diskCacheV111.util.CacheException;
-import diskCacheV111.util.CostException;
 
 import org.dcache.pool.assumption.AvailableSpaceAssumption;
 import org.dcache.vehicles.FileAttributes;
diff --git a/modules/dcache/src/main/java/org/dcache/poolmanager/RandomPartition.java b/modules/dcache/src/main/java/org/dcache/poolmanager/RandomPartition.java
index 16a3b2dca67..323561c8c7f 100644
--- a/modules/dcache/src/main/java/org/dcache/poolmanager/RandomPartition.java
+++ b/modules/dcache/src/main/java/org/dcache/poolmanager/RandomPartition.java
@@ -8,7 +8,6 @@
 import diskCacheV111.poolManager.CostModule;
 import diskCacheV111.pools.PoolCostInfo.PoolSpaceInfo;
 import diskCacheV111.util.CacheException;
-import diskCacheV111.util.CostException;
 
 import org.dcache.pool.assumption.AvailableSpaceAssumption;
 import org.dcache.vehicles.FileAttributes;
diff --git a/modules/dcache/src/main/java/org/dcache/poolmanager/WassPartition.java b/modules/dcache/src/main/java/org/dcache/poolmanager/WassPartition.java
index e18d576dabb..d1fe0f694d1 100644
--- a/modules/dcache/src/main/java/org/dcache/poolmanager/WassPartition.java
+++ b/modules/dcache/src/main/java/org/dcache/poolmanager/WassPartition.java
@@ -8,7 +8,6 @@
 
 import diskCacheV111.poolManager.CostModule;
 import diskCacheV111.util.CacheException;
-import diskCacheV111.util.CostException;
 import diskCacheV111.util.DestinationCostException;
 import diskCacheV111.util.PermissionDeniedCacheException;
 import diskCacheV111.util.SourceCostException;