diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile
index 1b75dcb8748a..11132d8c65d5 100644
--- a/security/vuxml/Makefile
+++ b/security/vuxml/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	vuxml
 PORTVERSION=	1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security textproc
 MASTER_SITES=	http://www.vuxml.org/dtd/vuxml-1/
 DISTFILES=	vuxml-10.dtd  vuxml-model-10.mod \
 		vuxml-11.dtd  vuxml-model-11.mod \
 		xml1.dcl catalog catalog.xml
 DIST_SUBDIR=	vuxml
 
 MAINTAINER=	ports-secteam@FreeBSD.org
 COMMENT=	Vulnerability and eXposure Markup Language DTD
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr \
 		xsltproc:textproc/libxslt \
 		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:textproc/xhtml-modularization \
 		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:textproc/xhtml-basic
 
 USES=		python:run
 
 NO_MTREE=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}
 
 dir_DTD=	share/xml/dtd/vuxml
 
 .include <bsd.port.pre.mk>
 
 VUXML_FILE?=	${PKGDIR}/vuln.xml
 VUXML_FLAT_FILE?=	${PKGDIR}/vuln-flat.xml
 _YEAR!=	date +%Y
-VUXML_CURRENT_FILE?=	${PKGDIR}/vuln-${_YEAR}.xml
+VUXML_CURRENT_FILE?=	${PKGDIR}/vuln/${_YEAR}.xml
 
 post-clean:
 	@${RM} "${VUXML_FILE}.tidy"
 	@${RM} "${VUXML_FLAT_FILE}"
 
 do-extract:
 	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 .for f in ${DISTFILES}
 	${CP} ${_DISTDIR}/${f} ${WRKDIR}/${f}
 .endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DTD}
 .for f in ${DISTFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${dir_DTD}/${f}
 .endfor
 
 do-test:
 	@${MKDIR} ${WRKDIR}/test
-	@${CP} ${.CURDIR}/vuln*.xml ${WRKDIR}/test
+	@${CP} -R ${.CURDIR}/vuln.xml ${.CURDIR}/vuln ${WRKDIR}/test
 	@cd ${.CURDIR} && make validate PKGDIR=${WRKDIR}/test
 
-${VUXML_FLAT_FILE}: ${VUXML_FILE} vuln-20??.xml
+${VUXML_FLAT_FILE}: ${VUXML_FILE} vuln/*.xml
 	xmllint -noent ${.ALLSRC:[1]} > ${.TARGET}
 
 validate: tidy
 	@${SH} ${FILESDIR}/validate.sh "${VUXML_FLAT_FILE}"
 	@${ECHO_MSG} Checking if tidy differs...
 	@if ${DIFF} -u "${VUXML_FLAT_FILE}" "${VUXML_FILE}.tidy"; \
 	then \
 		${ECHO_MSG} ... seems okay; \
 		${RM} "${VUXML_FILE}.tidy"; \
 	else \
 		return 1; \
 	fi
 	@${ECHO_MSG} Checking for space/tab...
 	@unexpand "${VUXML_FLAT_FILE}" | ${SED} -E 's,[[:space:]]*$$,,g' > "${VUXML_FILE}.unexpanded"
 	@if ${DIFF} -u "${VUXML_FLAT_FILE}" "${VUXML_FILE}.unexpanded"; \
 	then \
 		${ECHO_MSG} ... seems okay; \
 		${RM} "${VUXML_FILE}.unexpanded"; \
 	else \
 		${ECHO_MSG} ... see above; \
 		${ECHO_CMD} Consider using ${VUXML_FILE}.unexpanded for final commit; \
 		return 1; \
 	fi
 	${PYTHON_CMD} ${FILESDIR}/extra-validation.py ${VUXML_FLAT_FILE}
 
 tidy: ${VUXML_FLAT_FILE}
 	@if [ ! -e ${LOCALBASE}/share/xml/dtd/vuxml/catalog.xml ]; \
 	then \
 		echo "Please install the VuXML port prior to running make validate/tidy."; \
 		exit 1; \
 	fi
 	${SH} ${FILESDIR}/tidy.sh "${FILESDIR}/tidy.xsl" "${VUXML_FLAT_FILE}" > "${VUXML_FILE}.tidy"
 
 newentry:
 	@${SH} ${FILESDIR}/newentry.sh "${VUXML_CURRENT_FILE}"
 
 .if defined(VID) && !empty(VID)
 html: work/${VID}.html
 work/${VID}.html: ${FILESDIR}/html.xsl ${FILESDIR}/common.css ${VUXML_FILE}
 	${MKDIR} work
 	xsltproc --stringparam vid "${VID}" \
 	    --output ${.TARGET} \
 	    ${FILESDIR}/html.xsl ${VUXML_FILE}
 	${INSTALL_DATA} ${FILESDIR}/common.css work
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/vuxml/files/tidy.xsl b/security/vuxml/files/tidy.xsl
index e48c36c691c2..c912c0b4f7a1 100644
--- a/security/vuxml/files/tidy.xsl
+++ b/security/vuxml/files/tidy.xsl
@@ -1,133 +1,133 @@
 <?xml version="1.0"?>
 <xsl:stylesheet version="1.0"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns:vuxml="http://www.vuxml.org/apps/vuxml-1"
 	xmlns:xhtml="http://www.w3.org/1999/xhtml"
 	exclude-result-prefixes="vuxml xhtml"
 	>
 
 <xsl:param name="upper" select="'ABCDEF'" />
 <xsl:param name="lower" select="'abcdef'" />
 
 <xsl:output
   method="xml"
   encoding="utf-8"
   omit-xml-declaration="yes"
   indent="yes"
   />
 
 <!--
 All this special care is needed so that we can control the
 output of namespace declarations.  Using copy/copy-of may
 result in more namespace declarations than we wish.
 -->
 
 <xsl:template match="/">
 	<xsl:text disable-output-escaping="yes"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.1//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-11.dtd" [
-<!ENTITY vuln-2003 SYSTEM "vuln-2003.xml">
-<!ENTITY vuln-2004 SYSTEM "vuln-2004.xml">
-<!ENTITY vuln-2005 SYSTEM "vuln-2005.xml">
-<!ENTITY vuln-2006 SYSTEM "vuln-2006.xml">
-<!ENTITY vuln-2007 SYSTEM "vuln-2007.xml">
-<!ENTITY vuln-2008 SYSTEM "vuln-2008.xml">
-<!ENTITY vuln-2009 SYSTEM "vuln-2009.xml">
-<!ENTITY vuln-2010 SYSTEM "vuln-2010.xml">
-<!ENTITY vuln-2011 SYSTEM "vuln-2011.xml">
-<!ENTITY vuln-2012 SYSTEM "vuln-2012.xml">
-<!ENTITY vuln-2013 SYSTEM "vuln-2013.xml">
-<!ENTITY vuln-2014 SYSTEM "vuln-2014.xml">
-<!ENTITY vuln-2015 SYSTEM "vuln-2015.xml">
-<!ENTITY vuln-2016 SYSTEM "vuln-2016.xml">
-<!ENTITY vuln-2017 SYSTEM "vuln-2017.xml">
-<!ENTITY vuln-2018 SYSTEM "vuln-2018.xml">
-<!ENTITY vuln-2019 SYSTEM "vuln-2019.xml">
-<!ENTITY vuln-2020 SYSTEM "vuln-2020.xml">
-<!ENTITY vuln-2021 SYSTEM "vuln-2021.xml">
-<!ENTITY vuln-2022 SYSTEM "vuln-2022.xml">
+<!ENTITY vuln-2003 SYSTEM "vuln/2003.xml">
+<!ENTITY vuln-2004 SYSTEM "vuln/2004.xml">
+<!ENTITY vuln-2005 SYSTEM "vuln/2005.xml">
+<!ENTITY vuln-2006 SYSTEM "vuln/2006.xml">
+<!ENTITY vuln-2007 SYSTEM "vuln/2007.xml">
+<!ENTITY vuln-2008 SYSTEM "vuln/2008.xml">
+<!ENTITY vuln-2009 SYSTEM "vuln/2009.xml">
+<!ENTITY vuln-2010 SYSTEM "vuln/2010.xml">
+<!ENTITY vuln-2011 SYSTEM "vuln/2011.xml">
+<!ENTITY vuln-2012 SYSTEM "vuln/2012.xml">
+<!ENTITY vuln-2013 SYSTEM "vuln/2013.xml">
+<!ENTITY vuln-2014 SYSTEM "vuln/2014.xml">
+<!ENTITY vuln-2015 SYSTEM "vuln/2015.xml">
+<!ENTITY vuln-2016 SYSTEM "vuln/2016.xml">
+<!ENTITY vuln-2017 SYSTEM "vuln/2017.xml">
+<!ENTITY vuln-2018 SYSTEM "vuln/2018.xml">
+<!ENTITY vuln-2019 SYSTEM "vuln/2019.xml">
+<!ENTITY vuln-2020 SYSTEM "vuln/2020.xml">
+<!ENTITY vuln-2021 SYSTEM "vuln/2021.xml">
+<!ENTITY vuln-2022 SYSTEM "vuln/2022.xml">
 ]>
 ]]></xsl:text>
   <xsl:apply-templates />
 </xsl:template>
 
 <!-- Copy processing instructions and comments, too. -->
 <xsl:template match="processing-instruction()|comment()">
   <xsl:copy>
     <xsl:apply-templates />
   </xsl:copy>
 </xsl:template>
 
 <!--
 Set the namespace on the <vuxml> element.  Sort the <vuln> elements
 in descending order of their <modified> elements (or <entry>, if they
 don't have <modified>).  Insert an empty line between <vuln> elements.
 -->
 <xsl:template match="vuxml:vuxml">
   <xsl:element name="{name()}" namespace="{namespace-uri(.)}">
     <xsl:for-each select="@*">
       <xsl:attribute name="{name()}"><xsl:value-of
 	select="." /></xsl:attribute>
     </xsl:for-each>
     <xsl:for-each select="vuxml:vuln">
       <xsl:sort
 	order="descending"
 	select="vuxml:dates/entry/text()" />
       <xsl:text disable-output-escaping="yes">&#10;&#32;&#32;</xsl:text>
       <xsl:apply-templates select="." />
       <xsl:text disable-output-escaping="yes">&#10;</xsl:text>
     </xsl:for-each>
   </xsl:element>
 <xsl:text>&#10;</xsl:text>
 </xsl:template>
 
 <!--
 Many elements have only text content.  Strip extraneous whitespace
 from those elements.
 -->
 <xsl:template match="vuxml:topic|vuxml:name|vuxml:le|vuxml:lt|
   vuxml:ge|vuxml:gt|vuxml:eq|vuxml:cvename|vuxml:url|vuxml:bid|
   vuxml:certsa|vuxml:certvu|vuxml:uscertsa|vuxml:uscertta|
   vuxml:mlist|vuxml:freebsdsa|vuxml:freebsdpr|vuxml:discovery|
   vuxml:entry|vuxml:modified">
   <xsl:call-template name="normalize-space">
     <xsl:with-param name="node" select="." />
     <xsl:with-param name="namespace" select="namespace-uri(.)" />
   </xsl:call-template>
 </xsl:template>
 
 <!-- Default copy. -->
 <xsl:template match="*">
   <xsl:element name="{name()}" namespace="{namespace-uri(.)}">
     <xsl:call-template name="copy-attr">
       <xsl:with-param name="node" select="." />
     </xsl:call-template>
     <xsl:apply-templates />
   </xsl:element>
 </xsl:template>
 
 <!-- Copy attributes, but fold VuXML IDs (vid) to lower case.  -->
 <xsl:template name="copy-attr">
   <xsl:param name="node" />
     <xsl:if test="$node/@vid">
       <xsl:attribute name="vid"><xsl:value-of
 	  select="translate(@vid,$upper,$lower)" /></xsl:attribute>
     </xsl:if>
     <xsl:for-each select="$node/@*[name() != 'vid']">
       <xsl:attribute name="{name()}"><xsl:value-of
 	select="." /></xsl:attribute>
     </xsl:for-each>
 </xsl:template>
 
 <!-- Strip whitespace from elements with only text -->
 <xsl:template name="normalize-space">
   <xsl:param name="node" />
   <xsl:param name="namespace" />
   <xsl:element name="{name($node)}" namespace="{$namespace}">
     <xsl:call-template name="copy-attr">
       <xsl:with-param name="node" select="$node" />
     </xsl:call-template>
     <xsl:value-of select="normalize-space($node/text())" />
   </xsl:element>
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index 845b3df9e509..d181901f3970 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -1,104 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.1//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-11.dtd" [
-<!ENTITY vuln-2003 SYSTEM "vuln-2003.xml">
-<!ENTITY vuln-2004 SYSTEM "vuln-2004.xml">
-<!ENTITY vuln-2005 SYSTEM "vuln-2005.xml">
-<!ENTITY vuln-2006 SYSTEM "vuln-2006.xml">
-<!ENTITY vuln-2007 SYSTEM "vuln-2007.xml">
-<!ENTITY vuln-2008 SYSTEM "vuln-2008.xml">
-<!ENTITY vuln-2009 SYSTEM "vuln-2009.xml">
-<!ENTITY vuln-2010 SYSTEM "vuln-2010.xml">
-<!ENTITY vuln-2011 SYSTEM "vuln-2011.xml">
-<!ENTITY vuln-2012 SYSTEM "vuln-2012.xml">
-<!ENTITY vuln-2013 SYSTEM "vuln-2013.xml">
-<!ENTITY vuln-2014 SYSTEM "vuln-2014.xml">
-<!ENTITY vuln-2015 SYSTEM "vuln-2015.xml">
-<!ENTITY vuln-2016 SYSTEM "vuln-2016.xml">
-<!ENTITY vuln-2017 SYSTEM "vuln-2017.xml">
-<!ENTITY vuln-2018 SYSTEM "vuln-2018.xml">
-<!ENTITY vuln-2019 SYSTEM "vuln-2019.xml">
-<!ENTITY vuln-2020 SYSTEM "vuln-2020.xml">
-<!ENTITY vuln-2021 SYSTEM "vuln-2021.xml">
-<!ENTITY vuln-2022 SYSTEM "vuln-2022.xml">
+<!ENTITY vuln-2003 SYSTEM "vuln/2003.xml">
+<!ENTITY vuln-2004 SYSTEM "vuln/2004.xml">
+<!ENTITY vuln-2005 SYSTEM "vuln/2005.xml">
+<!ENTITY vuln-2006 SYSTEM "vuln/2006.xml">
+<!ENTITY vuln-2007 SYSTEM "vuln/2007.xml">
+<!ENTITY vuln-2008 SYSTEM "vuln/2008.xml">
+<!ENTITY vuln-2009 SYSTEM "vuln/2009.xml">
+<!ENTITY vuln-2010 SYSTEM "vuln/2010.xml">
+<!ENTITY vuln-2011 SYSTEM "vuln/2011.xml">
+<!ENTITY vuln-2012 SYSTEM "vuln/2012.xml">
+<!ENTITY vuln-2013 SYSTEM "vuln/2013.xml">
+<!ENTITY vuln-2014 SYSTEM "vuln/2014.xml">
+<!ENTITY vuln-2015 SYSTEM "vuln/2015.xml">
+<!ENTITY vuln-2016 SYSTEM "vuln/2016.xml">
+<!ENTITY vuln-2017 SYSTEM "vuln/2017.xml">
+<!ENTITY vuln-2018 SYSTEM "vuln/2018.xml">
+<!ENTITY vuln-2019 SYSTEM "vuln/2019.xml">
+<!ENTITY vuln-2020 SYSTEM "vuln/2020.xml">
+<!ENTITY vuln-2021 SYSTEM "vuln/2021.xml">
+<!ENTITY vuln-2022 SYSTEM "vuln/2022.xml">
 ]>
 <!--
 Copyright 2003-2022 Jacques Vidrine and contributors
 
 Redistribution and use in source (VuXML) and 'compiled' forms (SGML,
 HTML, PDF, PostScript, RTF and so forth) with or without modification,
 are permitted provided that the following conditions are met:
 1. Redistributions of source code (VuXML) must retain the above
    copyright notice, this list of conditions and the following
    disclaimer as the first lines of this file unmodified.
 2. Redistributions in compiled form (transformed to other DTDs,
    published online in any format, converted to PDF, PostScript,
    RTF and other formats) must reproduce the above copyright
    notice, this list of conditions and the following disclaimer
    in the documentation and/or other materials provided with the
    distribution.
 
 THIS DOCUMENTATION IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
 BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
 OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
 OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
 BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS DOCUMENTATION,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 QUICK GUIDE TO ADDING A NEW ENTRY
 
 1. run 'make newentry' to add a template to the top of the document
 2. fill in the template
 3. use 'make validate' to verify syntax correctness (you might need to install
    textproc/libxml2 for parser, and this port for catalogs)
 4. fix any errors
 5. use 'make VID=xxx-yyy-zzz html' to emit the entry's html file for formatting review
 6. profit!
 
 Additional tests can be done this way:
  $ make vuln-flat.xml
  $ pkg audit -f ./vuln-flat.xml py26-django-1.6
  $ pkg audit -f ./vuln-flat.xml py27-django-1.6.1
 
 Extensive documentation of the format and help with writing and verifying
 a new entry is available in The Porter's Handbook at:
 
   https://docs.freebsd.org/en/books/porters-handbook/security/#security-notify
 
 Help is also available from ports-security@freebsd.org.
 
 Notes:
 
   * Please add new entries to the beginning of the current year's file.
   * Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
 -->
 <vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
 &vuln-2022;
 &vuln-2021;
 &vuln-2020;
 &vuln-2019;
 &vuln-2018;
 &vuln-2017;
 &vuln-2016;
 &vuln-2015;
 &vuln-2014;
 &vuln-2013;
 &vuln-2012;
 &vuln-2011;
 &vuln-2010;
 &vuln-2009;
 &vuln-2008;
 &vuln-2007;
 &vuln-2006;
 &vuln-2005;
 &vuln-2004;
 &vuln-2003;</vuxml>
 <!-- EOF -->
 <!-- Note:  Please add new entries to the beginning of this file. -->
 <!-- ex: set ts=8 tw=80 sw=2: -->
 <!-- vim: set softtabstop=2 noexpandtab: -->
diff --git a/security/vuxml/vuln-2003.xml b/security/vuxml/vuln/2003.xml
similarity index 100%
rename from security/vuxml/vuln-2003.xml
rename to security/vuxml/vuln/2003.xml
diff --git a/security/vuxml/vuln-2004.xml b/security/vuxml/vuln/2004.xml
similarity index 100%
rename from security/vuxml/vuln-2004.xml
rename to security/vuxml/vuln/2004.xml
diff --git a/security/vuxml/vuln-2005.xml b/security/vuxml/vuln/2005.xml
similarity index 100%
rename from security/vuxml/vuln-2005.xml
rename to security/vuxml/vuln/2005.xml
diff --git a/security/vuxml/vuln-2006.xml b/security/vuxml/vuln/2006.xml
similarity index 100%
rename from security/vuxml/vuln-2006.xml
rename to security/vuxml/vuln/2006.xml
diff --git a/security/vuxml/vuln-2007.xml b/security/vuxml/vuln/2007.xml
similarity index 100%
rename from security/vuxml/vuln-2007.xml
rename to security/vuxml/vuln/2007.xml
diff --git a/security/vuxml/vuln-2008.xml b/security/vuxml/vuln/2008.xml
similarity index 100%
rename from security/vuxml/vuln-2008.xml
rename to security/vuxml/vuln/2008.xml
diff --git a/security/vuxml/vuln-2009.xml b/security/vuxml/vuln/2009.xml
similarity index 100%
rename from security/vuxml/vuln-2009.xml
rename to security/vuxml/vuln/2009.xml
diff --git a/security/vuxml/vuln-2010.xml b/security/vuxml/vuln/2010.xml
similarity index 100%
rename from security/vuxml/vuln-2010.xml
rename to security/vuxml/vuln/2010.xml
diff --git a/security/vuxml/vuln-2011.xml b/security/vuxml/vuln/2011.xml
similarity index 100%
rename from security/vuxml/vuln-2011.xml
rename to security/vuxml/vuln/2011.xml
diff --git a/security/vuxml/vuln-2012.xml b/security/vuxml/vuln/2012.xml
similarity index 100%
rename from security/vuxml/vuln-2012.xml
rename to security/vuxml/vuln/2012.xml
diff --git a/security/vuxml/vuln-2013.xml b/security/vuxml/vuln/2013.xml
similarity index 100%
rename from security/vuxml/vuln-2013.xml
rename to security/vuxml/vuln/2013.xml
diff --git a/security/vuxml/vuln-2014.xml b/security/vuxml/vuln/2014.xml
similarity index 100%
rename from security/vuxml/vuln-2014.xml
rename to security/vuxml/vuln/2014.xml
diff --git a/security/vuxml/vuln-2015.xml b/security/vuxml/vuln/2015.xml
similarity index 100%
rename from security/vuxml/vuln-2015.xml
rename to security/vuxml/vuln/2015.xml
diff --git a/security/vuxml/vuln-2016.xml b/security/vuxml/vuln/2016.xml
similarity index 100%
rename from security/vuxml/vuln-2016.xml
rename to security/vuxml/vuln/2016.xml
diff --git a/security/vuxml/vuln-2017.xml b/security/vuxml/vuln/2017.xml
similarity index 100%
rename from security/vuxml/vuln-2017.xml
rename to security/vuxml/vuln/2017.xml
diff --git a/security/vuxml/vuln-2018.xml b/security/vuxml/vuln/2018.xml
similarity index 100%
rename from security/vuxml/vuln-2018.xml
rename to security/vuxml/vuln/2018.xml
diff --git a/security/vuxml/vuln-2019.xml b/security/vuxml/vuln/2019.xml
similarity index 100%
rename from security/vuxml/vuln-2019.xml
rename to security/vuxml/vuln/2019.xml
diff --git a/security/vuxml/vuln-2020.xml b/security/vuxml/vuln/2020.xml
similarity index 100%
rename from security/vuxml/vuln-2020.xml
rename to security/vuxml/vuln/2020.xml
diff --git a/security/vuxml/vuln-2021.xml b/security/vuxml/vuln/2021.xml
similarity index 100%
rename from security/vuxml/vuln-2021.xml
rename to security/vuxml/vuln/2021.xml
diff --git a/security/vuxml/vuln-2022.xml b/security/vuxml/vuln/2022.xml
similarity index 100%
rename from security/vuxml/vuln-2022.xml
rename to security/vuxml/vuln/2022.xml