diff --git a/setup/data/export.cmd b/setup/data/export.cmd
index 5e54a4dec..16ad1a8e5 100644
--- a/setup/data/export.cmd
+++ b/setup/data/export.cmd
@@ -26,5 +26,3 @@ wget --output-document=17.contactchangetickets.xml --post-data="auth_user=%USER%
 wget --output-document=18.contracts.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT bizContract&format=xml"
 wget --output-document=19.infracontracts.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkInfraContract&format=xml"
 wget --output-document=20.contactcontracts.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT lnkContactContract&format=xml"
-wget --output-document=21.auditcategories.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT AuditCategory&format=xml"
-wget --output-document=22.auditrules.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT AuditRule&format=xml"
diff --git a/setup/data/21.auditcategories.xml b/setup/data/structure/21.auditcategories.xml
similarity index 100%
rename from setup/data/21.auditcategories.xml
rename to setup/data/structure/21.auditcategories.xml
diff --git a/setup/data/22.auditrules.xml b/setup/data/structure/22.auditrules.xml
similarity index 100%
rename from setup/data/22.auditrules.xml
rename to setup/data/structure/22.auditrules.xml
diff --git a/setup/data/structure/export_profiles.cmd b/setup/data/structure/export_profiles.cmd
index cd2873fd0..bc3a15050 100644
--- a/setup/data/structure/export_profiles.cmd
+++ b/setup/data/structure/export_profiles.cmd
@@ -13,4 +13,7 @@ wget --output-document=13.profileprojection.xml --post-data="auth_user=%USER%&au
 wget --output-document=14.actiongrant.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT URP_ActionGrant&format=xml"
 wget --output-document=15.attributegrant.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT URP_AttributeGrant&format=xml"
 wget --output-document=16.stimulusgrant.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT URP_StimulusGrant&format=xml"
+wget --output-document=21.auditcategories.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT AuditCategory&format=xml"
+wget --output-document=22.auditrules.xml --post-data="auth_user=%USER%&auth_pwd=%PWD%&operation=login" "%EXPORT%?expression=SELECT AuditRule&format=xml"
+
 pause
\ No newline at end of file