diff --git a/pslogin/src/main/scala/services/RemoverActor.scala b/common/src/main/scala/services/RemoverActor.scala
similarity index 100%
rename from pslogin/src/main/scala/services/RemoverActor.scala
rename to common/src/main/scala/services/RemoverActor.scala
diff --git a/pslogin/src/main/scala/services/avatar/support/DroppedItemRemover.scala b/common/src/main/scala/services/avatar/support/DroppedItemRemover.scala
similarity index 100%
rename from pslogin/src/main/scala/services/avatar/support/DroppedItemRemover.scala
rename to common/src/main/scala/services/avatar/support/DroppedItemRemover.scala
index 01bc9d47f..ce91fdf81 100644
--- a/pslogin/src/main/scala/services/avatar/support/DroppedItemRemover.scala
+++ b/common/src/main/scala/services/avatar/support/DroppedItemRemover.scala
@@ -3,8 +3,8 @@ package services.avatar.support
 
 import net.psforever.objects.equipment.Equipment
 import net.psforever.objects.guid.{GUIDTask, TaskResolver}
-import services.avatar.{AvatarAction, AvatarServiceMessage}
 import services.{RemoverActor, Service}
+import services.avatar.{AvatarAction, AvatarServiceMessage}
 
 import scala.concurrent.duration._
 
diff --git a/pslogin/src/main/scala/services/vehicle/support/VehicleRemover.scala b/common/src/main/scala/services/vehicle/support/VehicleRemover.scala
similarity index 100%
rename from pslogin/src/main/scala/services/vehicle/support/VehicleRemover.scala
rename to common/src/main/scala/services/vehicle/support/VehicleRemover.scala
index cec2e65e2..b60c9356b 100644
--- a/pslogin/src/main/scala/services/vehicle/support/VehicleRemover.scala
+++ b/common/src/main/scala/services/vehicle/support/VehicleRemover.scala
@@ -4,8 +4,8 @@ package services.vehicle.support
 import net.psforever.objects.Vehicle
 import net.psforever.objects.guid.{GUIDTask, TaskResolver}
 import net.psforever.objects.zones.Zone
-import services.vehicle.{VehicleAction, VehicleServiceMessage}
 import services.{RemoverActor, Service}
+import services.vehicle.{VehicleAction, VehicleServiceMessage}
 
 import scala.concurrent.duration._