diff --git a/components/engine/contrib/Dockerfile.tmLanguage/Dockerfile.YAML-tmLanguage b/components/engine/contrib/syntax/textmate/Dockerfile.YAML-tmLanguage
similarity index 100%
rename from components/engine/contrib/Dockerfile.tmLanguage/Dockerfile.YAML-tmLanguage
rename to components/engine/contrib/syntax/textmate/Dockerfile.YAML-tmLanguage
diff --git a/components/engine/contrib/Dockerfile.tmLanguage/Dockerfile.tmLanguage b/components/engine/contrib/syntax/textmate/Dockerfile.tmLanguage
similarity index 100%
rename from components/engine/contrib/Dockerfile.tmLanguage/Dockerfile.tmLanguage
rename to components/engine/contrib/syntax/textmate/Dockerfile.tmLanguage
diff --git a/components/engine/contrib/Dockerfile.tmLanguage/MAINTAINERS b/components/engine/contrib/syntax/textmate/MAINTAINERS
similarity index 100%
rename from components/engine/contrib/Dockerfile.tmLanguage/MAINTAINERS
rename to components/engine/contrib/syntax/textmate/MAINTAINERS
diff --git a/components/engine/contrib/Dockerfile.tmLanguage/README.md b/components/engine/contrib/syntax/textmate/README.md
similarity index 100%
rename from components/engine/contrib/Dockerfile.tmLanguage/README.md
rename to components/engine/contrib/syntax/textmate/README.md
diff --git a/components/engine/contrib/vim-syntax/LICENSE b/components/engine/contrib/syntax/vim/LICENSE
similarity index 100%
rename from components/engine/contrib/vim-syntax/LICENSE
rename to components/engine/contrib/syntax/vim/LICENSE
diff --git a/components/engine/contrib/vim-syntax/README.md b/components/engine/contrib/syntax/vim/README.md
similarity index 100%
rename from components/engine/contrib/vim-syntax/README.md
rename to components/engine/contrib/syntax/vim/README.md
diff --git a/components/engine/contrib/vim-syntax/doc/dockerfile.txt b/components/engine/contrib/syntax/vim/doc/dockerfile.txt
similarity index 100%
rename from components/engine/contrib/vim-syntax/doc/dockerfile.txt
rename to components/engine/contrib/syntax/vim/doc/dockerfile.txt
diff --git a/components/engine/contrib/vim-syntax/ftdetect/dockerfile.vim b/components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim
similarity index 100%
rename from components/engine/contrib/vim-syntax/ftdetect/dockerfile.vim
rename to components/engine/contrib/syntax/vim/ftdetect/dockerfile.vim
diff --git a/components/engine/contrib/vim-syntax/syntax/dockerfile.vim b/components/engine/contrib/syntax/vim/syntax/dockerfile.vim
similarity index 100%
rename from components/engine/contrib/vim-syntax/syntax/dockerfile.vim
rename to components/engine/contrib/syntax/vim/syntax/dockerfile.vim