diff --git a/src/json_messages.nim b/src/schema/json_messages.nim
similarity index 100%
rename from src/json_messages.nim
rename to src/schema/json_messages.nim
diff --git a/src/syndesizer/json_socket_translator.nim b/src/syndesizer/json_socket_translator.nim
index c45a018..5eb4695 100644
--- a/src/syndesizer/json_socket_translator.nim
+++ b/src/syndesizer/json_socket_translator.nim
@@ -5,7 +5,7 @@ import std/[json, options]
 import pkg/sys/[ioqueue, sockets]
 import preserves, preserves/jsonhooks, syndicate
 
-import ../schema/config, ../json_messages
+import ../schema/[config, json_messages]
 
 proc translateSocket(facet: Facet; ds: Cap; path: string) {.asyncio.} =
   var
diff --git a/src/syndesizer/json_translator.nim b/src/syndesizer/json_translator.nim
index 4d8a710..d270f18 100644
--- a/src/syndesizer/json_translator.nim
+++ b/src/syndesizer/json_translator.nim
@@ -5,8 +5,7 @@ import std/[json, osproc]
 import preserves
 import syndicate
 
-import ../schema/config
-import ../json_messages
+import ../schema/[config, json_messages]
 
 proc runChild(params: seq[string]): string =
   if params.len < 1: