diff --git a/buildroot/bin/uncrust b/buildroot/bin/uncrust
index 7c894174b8..db4c3fb03f 100755
--- a/buildroot/bin/uncrust
+++ b/buildroot/bin/uncrust
@@ -7,7 +7,7 @@ TMPDIR=`mktemp -d`
 HERE=`dirname "$0"`
 
 # Reformat a single file to tmp/
-if uncrustify -l CPP -c "$HERE/../share/extras/uncrustify.cfg" -f "$1" >$TMPDIR/uncrustify.out ; then
+if uncrustify -l CPP -c "$HERE/../share/uncrustify/uncrustify.cfg" -f "$1" >$TMPDIR/uncrustify.out ; then
   cp "$TMPDIR/uncrustify.out" "$1"  ; # Replace the original file
 else
   echo "Something went wrong with uncrustify."
diff --git a/buildroot/share/extras/file_header.h b/buildroot/share/uncrustify/file_header.h
similarity index 100%
rename from buildroot/share/extras/file_header.h
rename to buildroot/share/uncrustify/file_header.h
diff --git a/buildroot/share/extras/func_header.h b/buildroot/share/uncrustify/func_header.h
similarity index 100%
rename from buildroot/share/extras/func_header.h
rename to buildroot/share/uncrustify/func_header.h
diff --git a/buildroot/share/extras/uncrustify.cfg b/buildroot/share/uncrustify/uncrustify.cfg
similarity index 100%
rename from buildroot/share/extras/uncrustify.cfg
rename to buildroot/share/uncrustify/uncrustify.cfg