diff --git a/server/app/com/xsn/explorer/models/persisted/Transaction.scala b/server/app/com/xsn/explorer/models/persisted/Transaction.scala
index df9ffaf..5d6295d 100644
--- a/server/app/com/xsn/explorer/models/persisted/Transaction.scala
+++ b/server/app/com/xsn/explorer/models/persisted/Transaction.scala
@@ -1,7 +1,7 @@
 package com.xsn.explorer.models.persisted
 
-import com.xsn.explorer.models.values.{Address, Blockhash}
-import com.xsn.explorer.models.{HexString, Size, TransactionId, rpc}
+import com.xsn.explorer.models.values.{Address, Blockhash, HexString}
+import com.xsn.explorer.models.{Size, TransactionId, rpc}
 
 case class Transaction(
     id: TransactionId,
diff --git a/server/app/com/xsn/explorer/models/rpc/ScriptPubKey.scala b/server/app/com/xsn/explorer/models/rpc/ScriptPubKey.scala
index d20db19..5c1d6ad 100644
--- a/server/app/com/xsn/explorer/models/rpc/ScriptPubKey.scala
+++ b/server/app/com/xsn/explorer/models/rpc/ScriptPubKey.scala
@@ -1,7 +1,6 @@
 package com.xsn.explorer.models.rpc
 
-import com.xsn.explorer.models.HexString
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, HexString}
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{Reads, __}
 
diff --git a/server/app/com/xsn/explorer/models/HexString.scala b/server/app/com/xsn/explorer/models/values/HexString.scala
similarity index 89%
rename from server/app/com/xsn/explorer/models/HexString.scala
rename to server/app/com/xsn/explorer/models/values/HexString.scala
index 1056059..6698d77 100644
--- a/server/app/com/xsn/explorer/models/HexString.scala
+++ b/server/app/com/xsn/explorer/models/values/HexString.scala
@@ -1,4 +1,4 @@
-package com.xsn.explorer.models
+package com.xsn.explorer.models.values
 
 class HexString private (val string: String) extends AnyVal {
 
diff --git a/server/app/com/xsn/explorer/services/TransactionRPCService.scala b/server/app/com/xsn/explorer/services/TransactionRPCService.scala
index d17f99a..14cd0ec 100644
--- a/server/app/com/xsn/explorer/services/TransactionRPCService.scala
+++ b/server/app/com/xsn/explorer/services/TransactionRPCService.scala
@@ -5,7 +5,8 @@ import com.alexitc.playsonify.core.{FutureApplicationResult, FutureOr}
 import com.xsn.explorer.errors.{InvalidRawTransactionError, TransactionFormatError, TransactionNotFoundError, XSNWorkQueueDepthExceeded}
 import com.xsn.explorer.models.persisted.Transaction
 import com.xsn.explorer.models.rpc.TransactionVIN
-import com.xsn.explorer.models.{HexString, TransactionDetails, TransactionId, TransactionValue}
+import com.xsn.explorer.models.values._
+import com.xsn.explorer.models.{TransactionDetails, TransactionId, TransactionValue}
 import com.xsn.explorer.util.Extensions.FutureOrExt
 import javax.inject.Inject
 import org.scalactic.{Bad, Good, One, Or}
diff --git a/server/app/com/xsn/explorer/services/XSNService.scala b/server/app/com/xsn/explorer/services/XSNService.scala
index 2b1d29b..12afb44 100644
--- a/server/app/com/xsn/explorer/services/XSNService.scala
+++ b/server/app/com/xsn/explorer/services/XSNService.scala
@@ -7,7 +7,7 @@ import com.xsn.explorer.config.{ExplorerConfig, RPCConfig}
 import com.xsn.explorer.errors._
 import com.xsn.explorer.executors.ExternalServiceExecutionContext
 import com.xsn.explorer.models._
-import com.xsn.explorer.models.values.{Address, Blockhash, Height}
+import com.xsn.explorer.models.values.{Address, Blockhash, Height, HexString}
 import javax.inject.Inject
 import org.scalactic.{Bad, Good}
 import org.slf4j.LoggerFactory
diff --git a/server/test/com/xsn/explorer/data/TransactionPostgresDataHandlerSpec.scala b/server/test/com/xsn/explorer/data/TransactionPostgresDataHandlerSpec.scala
index 786ee6c..c88ac44 100644
--- a/server/test/com/xsn/explorer/data/TransactionPostgresDataHandlerSpec.scala
+++ b/server/test/com/xsn/explorer/data/TransactionPostgresDataHandlerSpec.scala
@@ -12,7 +12,7 @@ import com.xsn.explorer.models._
 import com.xsn.explorer.models.fields.TransactionField
 import com.xsn.explorer.models.persisted.Transaction
 import com.xsn.explorer.models.rpc.Block
-import com.xsn.explorer.models.values.Height
+import com.xsn.explorer.models.values.{Height, _}
 import org.scalactic.{Good, One, Or}
 import org.scalatest.BeforeAndAfter
 
diff --git a/server/test/com/xsn/explorer/helpers/DataGenerator.scala b/server/test/com/xsn/explorer/helpers/DataGenerator.scala
index a6bd48b..6144b65 100644
--- a/server/test/com/xsn/explorer/helpers/DataGenerator.scala
+++ b/server/test/com/xsn/explorer/helpers/DataGenerator.scala
@@ -2,8 +2,8 @@ package com.xsn.explorer.helpers
 
 import com.xsn.explorer.models.persisted.Transaction
 import com.xsn.explorer.models.rpc.Block
-import com.xsn.explorer.models.values.{Address, Blockhash, Confirmations, Height}
-import com.xsn.explorer.models.{HexString, Size, TransactionId}
+import com.xsn.explorer.models.values._
+import com.xsn.explorer.models.{Size, TransactionId}
 
 trait DataGenerator {
 
diff --git a/server/test/com/xsn/explorer/helpers/DummyXSNService.scala b/server/test/com/xsn/explorer/helpers/DummyXSNService.scala
index f290785..7585e59 100644
--- a/server/test/com/xsn/explorer/helpers/DummyXSNService.scala
+++ b/server/test/com/xsn/explorer/helpers/DummyXSNService.scala
@@ -3,7 +3,7 @@ package com.xsn.explorer.helpers
 import com.alexitc.playsonify.core.FutureApplicationResult
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.rpc.Masternode
-import com.xsn.explorer.models.values.{Address, Blockhash, Height}
+import com.xsn.explorer.models.values.{Address, Blockhash, Height, HexString}
 import com.xsn.explorer.services.XSNService
 import play.api.libs.json.JsValue
 
diff --git a/server/test/com/xsn/explorer/models/rpc/ScriptPubKeySpec.scala b/server/test/com/xsn/explorer/models/rpc/ScriptPubKeySpec.scala
index a7e1364..35cf6d9 100644
--- a/server/test/com/xsn/explorer/models/rpc/ScriptPubKeySpec.scala
+++ b/server/test/com/xsn/explorer/models/rpc/ScriptPubKeySpec.scala
@@ -1,7 +1,6 @@
 package com.xsn.explorer.models.rpc
 
-import com.xsn.explorer.models.HexString
-import com.xsn.explorer.models.values._
+import com.xsn.explorer.models.values.{HexString, _}
 import org.scalatest.{MustMatchers, OptionValues, WordSpec}
 
 class ScriptPubKeySpec extends WordSpec with MustMatchers with OptionValues {
diff --git a/server/test/com/xsn/explorer/models/HexStringSpec.scala b/server/test/com/xsn/explorer/models/values/HexStringSpec.scala
similarity index 98%
rename from server/test/com/xsn/explorer/models/HexStringSpec.scala
rename to server/test/com/xsn/explorer/models/values/HexStringSpec.scala
index 3a38ad6..8a10921 100644
--- a/server/test/com/xsn/explorer/models/HexStringSpec.scala
+++ b/server/test/com/xsn/explorer/models/values/HexStringSpec.scala
@@ -1,4 +1,4 @@
-package com.xsn.explorer.models
+package com.xsn.explorer.models.values
 
 import org.scalatest.{MustMatchers, OptionValues, WordSpec}
 
diff --git a/server/test/controllers/AddressesControllerSpec.scala b/server/test/controllers/AddressesControllerSpec.scala
index d26b049..dc7bbed 100644
--- a/server/test/controllers/AddressesControllerSpec.scala
+++ b/server/test/controllers/AddressesControllerSpec.scala
@@ -9,7 +9,7 @@ import com.xsn.explorer.helpers.{BalanceDummyDataHandler, DataHelper, Transactio
 import com.xsn.explorer.models._
 import com.xsn.explorer.models.fields.TransactionField
 import com.xsn.explorer.models.persisted.{Balance, Transaction}
-import com.xsn.explorer.models.values.Address
+import com.xsn.explorer.models.values.{Address, _}
 import com.xsn.explorer.util.Extensions.BigDecimalExt
 import controllers.common.MyAPISpec
 import org.scalactic.Good