diff --git a/build.sbt b/build.sbt
index d41b1740..03fde643 100644
--- a/build.sbt
+++ b/build.sbt
@@ -48,8 +48,7 @@ lazy val commonSettings = Seq(
     "io.kamon"                   %% "kamon-bundle"  % "2.1.0",
     "io.kamon"                   %% "kamon-apm-reporter" % "2.1.0",
     "org.json4s"                 %% "json4s-native" % "3.6.8",
-    "com.typesafe.akka"          %% "akka-stream"   % "2.6.5",
-    "org.scala-lang.modules"     %% "scala-parallel-collections" % "0.2.0"
+    "com.typesafe.akka"          %% "akka-stream"   % "2.6.5"
   )
 )
 
@@ -103,5 +102,13 @@ lazy val common = (project in file("common")).
   ).
   settings(pscryptoSettings: _*)
 
+lazy val decodePackets = (project in file("tools/decode-packets")).
+  settings(commonSettings: _*).
+  settings(
+    libraryDependencies ++= Seq(
+      "org.scala-lang.modules"     %% "scala-parallel-collections" % "0.2.0"
+    )
+  )
+
 // Special test configuration for really quiet tests (used in CI)
 lazy val QuietTest = config("quiet") extend(Test)
diff --git a/pslogin/src/main/scala/scripts/XToolsV2.scala b/tools/decode-packets/src/main/scala/XToolsV2.scala
similarity index 99%
rename from pslogin/src/main/scala/scripts/XToolsV2.scala
rename to tools/decode-packets/src/main/scala/XToolsV2.scala
index 547703cf..a162bd39 100644
--- a/pslogin/src/main/scala/scripts/XToolsV2.scala
+++ b/tools/decode-packets/src/main/scala/XToolsV2.scala
@@ -1,12 +1,10 @@
-package scripts
-
 import java.io.{BufferedWriter, File, FileWriter}
-import java.nio.file.{Files, Paths, StandardCopyOption}
 import java.nio.charset.CodingErrorAction
 
-import net.psforever.packet._
+import net.psforever.packet.PacketCoding
 import scodec.bits._
 import scodec.Attempt.{Failure, Successful}
+import java.nio.file.{Files, Paths, StandardCopyOption}
 
 import scala.io.{Codec, Source}
 import util.control.Breaks._