diff --git a/json_serialization/lexer.nim b/json_serialization/lexer.nim
index 15cbfdb..fdd827a 100644
--- a/json_serialization/lexer.nim
+++ b/json_serialization/lexer.nim
@@ -1,10 +1,10 @@
 import
-  unicode, json,
+  std/[unicode, json],
   faststreams/inputs,
   types
 
 export
-  inputs
+  inputs, types
 
 type
   TokKind* = enum
diff --git a/json_serialization/reader.nim b/json_serialization/reader.nim
index 2c2b31b..f327526 100644
--- a/json_serialization/reader.nim
+++ b/json_serialization/reader.nim
@@ -3,12 +3,12 @@
 import
   std/[tables, strutils, typetraits, macros, strformat],
   faststreams/inputs, serialization/[formats, object_serialization, errors],
-  format, types, lexer
+  "."/[format, types, lexer]
 
 from json import JsonNode, JsonNodeKind
 
 export
-  format, types, errors
+  inputs, format, types, errors
 
 type
   JsonReader*[Flavor = DefaultFlavor] = object
diff --git a/json_serialization/types.nim b/json_serialization/types.nim
index 290c06d..7e712c7 100644
--- a/json_serialization/types.nim
+++ b/json_serialization/types.nim
@@ -1,5 +1,4 @@
 import
-  tables,
   serialization/errors
 
 export
diff --git a/json_serialization/writer.nim b/json_serialization/writer.nim
index f044ee3..5989031 100644
--- a/json_serialization/writer.nim
+++ b/json_serialization/writer.nim
@@ -1,10 +1,10 @@
 import
-  std/typetraits,
-  faststreams/[outputs, textio], serialization, json,
-  format, types
+  std/[json, typetraits],
+  faststreams/[outputs, textio], serialization,
+  "."/[format, types]
 
 export
-  format, JsonString, DefaultFlavor
+  outputs, format, types, JsonString, DefaultFlavor
 
 type
   JsonWriterState = enum