diff --git a/pslogin/src/main/scala/services/Service.scala b/common/src/main/scala/services/Service.scala
similarity index 100%
rename from pslogin/src/main/scala/services/Service.scala
rename to common/src/main/scala/services/Service.scala
diff --git a/pslogin/src/main/scala/services/ServiceManager.scala b/common/src/main/scala/services/ServiceManager.scala
similarity index 100%
rename from pslogin/src/main/scala/services/ServiceManager.scala
rename to common/src/main/scala/services/ServiceManager.scala
diff --git a/pslogin/src/main/scala/services/avatar/AvatarAction.scala b/common/src/main/scala/services/avatar/AvatarAction.scala
similarity index 100%
rename from pslogin/src/main/scala/services/avatar/AvatarAction.scala
rename to common/src/main/scala/services/avatar/AvatarAction.scala
diff --git a/pslogin/src/main/scala/services/avatar/AvatarResponse.scala b/common/src/main/scala/services/avatar/AvatarResponse.scala
similarity index 100%
rename from pslogin/src/main/scala/services/avatar/AvatarResponse.scala
rename to common/src/main/scala/services/avatar/AvatarResponse.scala
diff --git a/pslogin/src/main/scala/services/avatar/AvatarService.scala b/common/src/main/scala/services/avatar/AvatarService.scala
similarity index 100%
rename from pslogin/src/main/scala/services/avatar/AvatarService.scala
rename to common/src/main/scala/services/avatar/AvatarService.scala
index 17cec7ae..9bd793a2 100644
--- a/pslogin/src/main/scala/services/avatar/AvatarService.scala
+++ b/common/src/main/scala/services/avatar/AvatarService.scala
@@ -2,8 +2,8 @@
 package services.avatar
 
 import akka.actor.{Actor, ActorRef, Props}
-import services.avatar.support.CorpseRemovalActor
 import services.{GenericEventBus, Service}
+import services.avatar.support.CorpseRemovalActor
 
 class AvatarService extends Actor {
   private val undertaker : ActorRef = context.actorOf(Props[CorpseRemovalActor], "corpse-removal-agent")
diff --git a/pslogin/src/main/scala/services/avatar/AvatarServiceMessage.scala b/common/src/main/scala/services/avatar/AvatarServiceMessage.scala
similarity index 100%
rename from pslogin/src/main/scala/services/avatar/AvatarServiceMessage.scala
rename to common/src/main/scala/services/avatar/AvatarServiceMessage.scala
diff --git a/pslogin/src/main/scala/services/avatar/AvatarServiceResponse.scala b/common/src/main/scala/services/avatar/AvatarServiceResponse.scala
similarity index 100%
rename from pslogin/src/main/scala/services/avatar/AvatarServiceResponse.scala
rename to common/src/main/scala/services/avatar/AvatarServiceResponse.scala
diff --git a/pslogin/src/main/scala/services/avatar/support/CorpseRemovalActor.scala b/common/src/main/scala/services/avatar/support/CorpseRemovalActor.scala
similarity index 100%
rename from pslogin/src/main/scala/services/avatar/support/CorpseRemovalActor.scala
rename to common/src/main/scala/services/avatar/support/CorpseRemovalActor.scala
diff --git a/pslogin/src/main/scala/services/local/LocalAction.scala b/common/src/main/scala/services/local/LocalAction.scala
similarity index 100%
rename from pslogin/src/main/scala/services/local/LocalAction.scala
rename to common/src/main/scala/services/local/LocalAction.scala
diff --git a/pslogin/src/main/scala/services/local/LocalResponse.scala b/common/src/main/scala/services/local/LocalResponse.scala
similarity index 100%
rename from pslogin/src/main/scala/services/local/LocalResponse.scala
rename to common/src/main/scala/services/local/LocalResponse.scala
diff --git a/pslogin/src/main/scala/services/local/LocalService.scala b/common/src/main/scala/services/local/LocalService.scala
similarity index 100%
rename from pslogin/src/main/scala/services/local/LocalService.scala
rename to common/src/main/scala/services/local/LocalService.scala
index 5c01ee1a..2d2570ce 100644
--- a/pslogin/src/main/scala/services/local/LocalService.scala
+++ b/common/src/main/scala/services/local/LocalService.scala
@@ -2,8 +2,8 @@
 package services.local
 
 import akka.actor.{Actor, Props}
-import services.local.support.{DoorCloseActor, HackClearActor}
 import services.{GenericEventBus, Service}
+import services.local.support.{DoorCloseActor, HackClearActor}
 
 class LocalService extends Actor {
   private val doorCloser = context.actorOf(Props[DoorCloseActor], "local-door-closer")
diff --git a/pslogin/src/main/scala/services/local/LocalServiceMessage.scala b/common/src/main/scala/services/local/LocalServiceMessage.scala
similarity index 100%
rename from pslogin/src/main/scala/services/local/LocalServiceMessage.scala
rename to common/src/main/scala/services/local/LocalServiceMessage.scala
diff --git a/pslogin/src/main/scala/services/local/LocalServiceResponse.scala b/common/src/main/scala/services/local/LocalServiceResponse.scala
similarity index 100%
rename from pslogin/src/main/scala/services/local/LocalServiceResponse.scala
rename to common/src/main/scala/services/local/LocalServiceResponse.scala
diff --git a/pslogin/src/main/scala/services/local/support/DoorCloseActor.scala b/common/src/main/scala/services/local/support/DoorCloseActor.scala
similarity index 100%
rename from pslogin/src/main/scala/services/local/support/DoorCloseActor.scala
rename to common/src/main/scala/services/local/support/DoorCloseActor.scala
diff --git a/pslogin/src/main/scala/services/local/support/HackClearActor.scala b/common/src/main/scala/services/local/support/HackClearActor.scala
similarity index 100%
rename from pslogin/src/main/scala/services/local/support/HackClearActor.scala
rename to common/src/main/scala/services/local/support/HackClearActor.scala
diff --git a/pslogin/src/main/scala/services/vehicle/VehicleAction.scala b/common/src/main/scala/services/vehicle/VehicleAction.scala
similarity index 100%
rename from pslogin/src/main/scala/services/vehicle/VehicleAction.scala
rename to common/src/main/scala/services/vehicle/VehicleAction.scala
diff --git a/pslogin/src/main/scala/services/vehicle/VehicleResponse.scala b/common/src/main/scala/services/vehicle/VehicleResponse.scala
similarity index 100%
rename from pslogin/src/main/scala/services/vehicle/VehicleResponse.scala
rename to common/src/main/scala/services/vehicle/VehicleResponse.scala
diff --git a/pslogin/src/main/scala/services/vehicle/VehicleService.scala b/common/src/main/scala/services/vehicle/VehicleService.scala
similarity index 99%
rename from pslogin/src/main/scala/services/vehicle/VehicleService.scala
rename to common/src/main/scala/services/vehicle/VehicleService.scala
index 6b16ec2b..51ae1aeb 100644
--- a/pslogin/src/main/scala/services/vehicle/VehicleService.scala
+++ b/common/src/main/scala/services/vehicle/VehicleService.scala
@@ -4,10 +4,9 @@ package services.vehicle
 import akka.actor.{Actor, ActorRef, Props}
 import net.psforever.objects.serverobject.pad.VehicleSpawnPad
 import net.psforever.objects.zones.Zone
-import services.vehicle.support.{DeconstructionActor, DelayedDeconstructionActor}
 import net.psforever.types.DriveState
-
 import services.{GenericEventBus, Service}
+import services.vehicle.support.{DeconstructionActor, DelayedDeconstructionActor}
 
 class VehicleService extends Actor {
   private val vehicleDecon : ActorRef = context.actorOf(Props[DeconstructionActor], "vehicle-decon-agent")
diff --git a/pslogin/src/main/scala/services/vehicle/VehicleServiceMessage.scala b/common/src/main/scala/services/vehicle/VehicleServiceMessage.scala
similarity index 100%
rename from pslogin/src/main/scala/services/vehicle/VehicleServiceMessage.scala
rename to common/src/main/scala/services/vehicle/VehicleServiceMessage.scala
diff --git a/pslogin/src/main/scala/services/vehicle/VehicleServiceResponse.scala b/common/src/main/scala/services/vehicle/VehicleServiceResponse.scala
similarity index 100%
rename from pslogin/src/main/scala/services/vehicle/VehicleServiceResponse.scala
rename to common/src/main/scala/services/vehicle/VehicleServiceResponse.scala
diff --git a/pslogin/src/main/scala/services/vehicle/support/DeconstructionActor.scala b/common/src/main/scala/services/vehicle/support/DeconstructionActor.scala
similarity index 100%
rename from pslogin/src/main/scala/services/vehicle/support/DeconstructionActor.scala
rename to common/src/main/scala/services/vehicle/support/DeconstructionActor.scala
diff --git a/pslogin/src/main/scala/services/vehicle/support/DelayedDeconstructionActor.scala b/common/src/main/scala/services/vehicle/support/DelayedDeconstructionActor.scala
similarity index 100%
rename from pslogin/src/main/scala/services/vehicle/support/DelayedDeconstructionActor.scala
rename to common/src/main/scala/services/vehicle/support/DelayedDeconstructionActor.scala