diff --git a/rpcserver.nim b/rpcserver.nim
index ef197d1..7568e4d 100644
--- a/rpcserver.nim
+++ b/rpcserver.nim
@@ -1,2 +1,2 @@
-import json_rpc / server
-export server
+import json_rpc / server, json_rpc / transports / socket
+export server, socket
diff --git a/rpcsocket.nim b/rpcsocket.nim
deleted file mode 100644
index 7568e4d..0000000
--- a/rpcsocket.nim
+++ /dev/null
@@ -1,2 +0,0 @@
-import json_rpc / server, json_rpc / transports / socket
-export server, socket
diff --git a/tests/testerrors.nim b/tests/testerrors.nim
index 5e856f1..03afad6 100644
--- a/tests/testerrors.nim
+++ b/tests/testerrors.nim
@@ -3,7 +3,7 @@
   allow unchecked and unformatted calls.
 ]#
 
-import unittest, debugclient, ../rpcsocket
+import unittest, debugclient, ../rpcserver
 import strformat, chronicles
 
 var server = newRpcSocketServer("localhost", 8547.Port)
diff --git a/tests/testethcalls.nim b/tests/testethcalls.nim
index 572c808..6be998d 100644
--- a/tests/testethcalls.nim
+++ b/tests/testethcalls.nim
@@ -1,5 +1,5 @@
 import unittest, json, tables
-import ../rpcclient, ../rpcsocket
+import ../rpcclient, ../rpcserver
 import stint, ethtypes, ethprocs, stintjson, nimcrypto, ethhexstrings, chronicles
 
 from os import getCurrentDir, DirSep
diff --git a/tests/testrpcmacro.nim b/tests/testrpcmacro.nim
index 43cab64..8d10b8c 100644
--- a/tests/testrpcmacro.nim
+++ b/tests/testrpcmacro.nim
@@ -1,5 +1,5 @@
 import unittest, json, tables, chronicles
-import ../rpcsocket
+import ../rpcserver
 
 type
   # some nested types to check object parsing
diff --git a/tests/testserverclient.nim b/tests/testserverclient.nim
index a50f03f..23f5ba8 100644
--- a/tests/testserverclient.nim
+++ b/tests/testserverclient.nim
@@ -1,5 +1,5 @@
 import unittest, json, chronicles
-import  ../rpcclient, ../rpcsocket
+import  ../rpcclient, ../rpcserver
 
 var srv = newRpcSocketServer(["localhost:8545"])
 var client = newRpcStreamClient()