diff --git a/nixd/lib/Syntax/Lexer.l b/nixd/lib/Syntax/Lexer/Lexer.l
similarity index 99%
rename from nixd/lib/Syntax/Lexer.l
rename to nixd/lib/Syntax/Lexer/Lexer.l
index fbdc81934..c9cee5ed0 100644
--- a/nixd/lib/Syntax/Lexer.l
+++ b/nixd/lib/Syntax/Lexer/Lexer.l
@@ -15,7 +15,7 @@
 
 
 %{
-#include "nixd/Syntax/Lexer/Prologue.cpp"
+#include "Lexer/Prologue.cpp"
 %}
 
 
diff --git a/nixd/include/nixd/Syntax/Lexer/Prologue.cpp b/nixd/lib/Syntax/Lexer/Prologue.cpp
similarity index 100%
rename from nixd/include/nixd/Syntax/Lexer/Prologue.cpp
rename to nixd/lib/Syntax/Lexer/Prologue.cpp
diff --git a/nixd/lib/Syntax/Parser.y b/nixd/lib/Syntax/Parser/Parser.y
similarity index 98%
rename from nixd/lib/Syntax/Parser.y
rename to nixd/lib/Syntax/Parser/Parser.y
index 819198dcb..0f23d7220 100644
--- a/nixd/lib/Syntax/Parser.y
+++ b/nixd/lib/Syntax/Parser/Parser.y
@@ -14,7 +14,7 @@
 }
 
 %{
-#include "nixd/Syntax/Parser/Prologue.cpp"
+#include "Parser/Prologue.cpp"
 %}
 
 %union {
diff --git a/nixd/include/nixd/Syntax/Parser/Prologue.cpp b/nixd/lib/Syntax/Parser/Prologue.cpp
similarity index 100%
rename from nixd/include/nixd/Syntax/Parser/Prologue.cpp
rename to nixd/lib/Syntax/Parser/Prologue.cpp
diff --git a/nixd/lib/Syntax/meson.build b/nixd/lib/Syntax/meson.build
index 2ac1f6d3c..30a62cf39 100644
--- a/nixd/lib/Syntax/meson.build
+++ b/nixd/lib/Syntax/meson.build
@@ -7,13 +7,13 @@ bison = find_program('bison')
 # https://github.com/NixOS/nix/blob/a1cf16563f681b5cb3026f2bbca629996ed36d86/src/libexpr/local.mk#L31
 
 lexer = custom_target('lexer'
-, input : [ 'Lexer.l' ]
+, input : [ 'Lexer/Lexer.l' ]
 , output : [ '@BASENAME@.tab.cpp', '@BASENAME@.tab.h' ]
 , command : [ flex, '--outfile=@OUTPUT0@', '--header-file=@OUTPUT1@', '@INPUT@' ]
 )
 
 parser = custom_target('parser'
-, input : [ 'Parser.y' ]
+, input : [ 'Parser/Parser.y' ]
 , output : [ '@BASENAME@.tab.cpp', '@BASENAME@.tab.h' ]
 , command : [ bison, '@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@' ]
 )