diff --git a/.gitattributes b/.gitattributes
index c4b3dab15..34b1a752a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -26,9 +26,9 @@ configure				-whitespace
 
 # except these exceptions...
 src/backend/distributed/utils/citus_outfuncs.c -citus-style
-src/backend/distributed/utils/ruleutils_10.c -citus-style
-src/backend/distributed/utils/ruleutils_11.c -citus-style
-src/backend/distributed/utils/ruleutils_12.c -citus-style
+src/backend/distributed/deparser/ruleutils_10.c -citus-style
+src/backend/distributed/deparser/ruleutils_11.c -citus-style
+src/backend/distributed/deparser/ruleutils_12.c -citus-style
 src/include/distributed/citus_nodes.h -citus-style
 
 # Hide diff on github by default for copied udfs
diff --git a/src/backend/distributed/utils/citus_ruleutils.c b/src/backend/distributed/deparser/citus_ruleutils.c
similarity index 100%
rename from src/backend/distributed/utils/citus_ruleutils.c
rename to src/backend/distributed/deparser/citus_ruleutils.c
diff --git a/src/backend/distributed/utils/ruleutils_11.c b/src/backend/distributed/deparser/ruleutils_11.c
similarity index 100%
rename from src/backend/distributed/utils/ruleutils_11.c
rename to src/backend/distributed/deparser/ruleutils_11.c
diff --git a/src/backend/distributed/utils/ruleutils_12.c b/src/backend/distributed/deparser/ruleutils_12.c
similarity index 100%
rename from src/backend/distributed/utils/ruleutils_12.c
rename to src/backend/distributed/deparser/ruleutils_12.c
diff --git a/src/backend/distributed/utils/metadata_cache.c b/src/backend/distributed/metadata/metadata_cache.c
similarity index 100%
rename from src/backend/distributed/utils/metadata_cache.c
rename to src/backend/distributed/metadata/metadata_cache.c
diff --git a/src/backend/distributed/utils/node_metadata.c b/src/backend/distributed/metadata/node_metadata.c
similarity index 100%
rename from src/backend/distributed/utils/node_metadata.c
rename to src/backend/distributed/metadata/node_metadata.c