diff --git a/TODO b/TODO
index a660862b..5155c8cc 100644
--- a/TODO
+++ b/TODO
@@ -45,7 +45,6 @@ CONFIGDOC
    which files use what configuration
 
 IF IT AIN'T BROKE...
- - Create "super" script which performs all regeneration actions
  - Simplify merge library script by removing recursion? (or other things)
  - Perhaps replace types with integer identifiers in ConfigSchema? (would be
    smaller, but not by much).
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.AllowedFrameTargets.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.AllowedFrameTargets.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedFrameTargets.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.AllowedRel.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.AllowedRel.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRel.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.AllowedRev.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.AllowedRev.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.AllowedRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.DefaultInvalidImage.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.DefaultInvalidImage.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImage.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.DefaultInvalidImageAlt.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.DefaultInvalidImageAlt.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultInvalidImageAlt.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.DefaultTextDir.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.DefaultTextDir.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.DefaultTextDir.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.EnableID.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.EnableID.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.EnableID.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.IDBlacklist.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.IDBlacklist.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklist.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.IDBlacklistRegexp.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.IDBlacklistRegexp.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.IDBlacklistRegexp.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.IDPrefix.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.IDPrefix.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefix.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.IDPrefixLocal.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.IDPrefixLocal.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.IDPrefixLocal.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Attr.txt b/library/HTMLPurifier/ConfigSchema/schema/Attr.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Attr.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Attr.txt
diff --git a/library/HTMLPurifier/ConfigSchema/AutoFormat.AutoParagraph.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/AutoFormat.AutoParagraph.txt
rename to library/HTMLPurifier/ConfigSchema/schema/AutoFormat.AutoParagraph.txt
diff --git a/library/HTMLPurifier/ConfigSchema/AutoFormat.Custom.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/AutoFormat.Custom.txt
rename to library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Custom.txt
diff --git a/library/HTMLPurifier/ConfigSchema/AutoFormat.Linkify.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/AutoFormat.Linkify.txt
rename to library/HTMLPurifier/ConfigSchema/schema/AutoFormat.Linkify.txt
diff --git a/library/HTMLPurifier/ConfigSchema/AutoFormat.PurifierLinkify.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/AutoFormat.PurifierLinkify.txt
rename to library/HTMLPurifier/ConfigSchema/schema/AutoFormat.PurifierLinkify.txt
diff --git a/library/HTMLPurifier/ConfigSchema/AutoFormat.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormat.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/AutoFormat.txt
rename to library/HTMLPurifier/ConfigSchema/schema/AutoFormat.txt
diff --git a/library/HTMLPurifier/ConfigSchema/AutoFormatParam.PurifierLinkifyDocURL.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.PurifierLinkifyDocURL.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/AutoFormatParam.PurifierLinkifyDocURL.txt
rename to library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.PurifierLinkifyDocURL.txt
diff --git a/library/HTMLPurifier/ConfigSchema/AutoFormatParam.txt b/library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/AutoFormatParam.txt
rename to library/HTMLPurifier/ConfigSchema/schema/AutoFormatParam.txt
diff --git a/library/HTMLPurifier/ConfigSchema/CSS.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/CSS.DefinitionRev.txt
rename to library/HTMLPurifier/ConfigSchema/schema/CSS.DefinitionRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/CSS.Proprietary.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/CSS.Proprietary.txt
rename to library/HTMLPurifier/ConfigSchema/schema/CSS.Proprietary.txt
diff --git a/library/HTMLPurifier/ConfigSchema/CSS.txt b/library/HTMLPurifier/ConfigSchema/schema/CSS.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/CSS.txt
rename to library/HTMLPurifier/ConfigSchema/schema/CSS.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Cache.DefinitionImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Cache.DefinitionImpl.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Cache.DefinitionImpl.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Cache.SerializerPath.txt b/library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Cache.SerializerPath.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Cache.SerializerPath.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Cache.txt b/library/HTMLPurifier/ConfigSchema/schema/Cache.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Cache.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Cache.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.AggressivelyFixLt.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.AggressivelyFixLt.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.AggressivelyFixLt.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.CollectErrors.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.CollectErrors.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.CollectErrors.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.ColorKeywords.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.ColorKeywords.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.ColorKeywords.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.ConvertDocumentToFragment.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.ConvertDocumentToFragment.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.ConvertDocumentToFragment.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.DirectLexLineNumberSyncInterval.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.DirectLexLineNumberSyncInterval.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.DirectLexLineNumberSyncInterval.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.Encoding.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.Encoding.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.Encoding.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.EscapeInvalidChildren.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.EscapeInvalidChildren.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidChildren.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.EscapeInvalidTags.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.EscapeInvalidTags.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.EscapeInvalidTags.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.EscapeNonASCIICharacters.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.EscapeNonASCIICharacters.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.EscapeNonASCIICharacters.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.HiddenElements.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.HiddenElements.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.HiddenElements.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.Language.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.Language.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.Language.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.LexerImpl.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.LexerImpl.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.LexerImpl.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.MaintainLineNumbers.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.MaintainLineNumbers.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.MaintainLineNumbers.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.RemoveInvalidImg.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.RemoveInvalidImg.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.RemoveInvalidImg.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.RemoveScriptContents.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.RemoveScriptContents.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.RemoveScriptContents.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Core.txt b/library/HTMLPurifier/ConfigSchema/schema/Core.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Core.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Core.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Filter.ExtractStyleBlocksEscaping.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocksEscaping.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Filter.ExtractStyleBlocksEscaping.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocksEscaping.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Filter.ExtractStyleBlocksScope.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocksScope.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Filter.ExtractStyleBlocksScope.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Filter.ExtractStyleBlocksScope.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Filter.txt b/library/HTMLPurifier/ConfigSchema/schema/Filter.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Filter.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Filter.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.Allowed.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.Allowed.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.Allowed.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.AllowedAttributes.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.AllowedAttributes.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedAttributes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.AllowedElements.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.AllowedElements.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedElements.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.AllowedModules.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.AllowedModules.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.AllowedModules.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.BlockWrapper.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.BlockWrapper.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.BlockWrapper.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.CoreModules.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.CoreModules.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.CoreModules.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.CustomDoctype.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.CustomDoctype.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.CustomDoctype.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.DefinitionID.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.DefinitionID.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionID.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.DefinitionRev.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.DefinitionRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.Doctype.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.Doctype.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.Doctype.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.Parent.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.Parent.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.Parent.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.Proprietary.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.Proprietary.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.Proprietary.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.Strict.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.Strict.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.Strict.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.TidyAdd.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.TidyAdd.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.TidyAdd.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.TidyLevel.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.TidyLevel.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.TidyLevel.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.TidyRemove.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.TidyRemove.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.TidyRemove.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.Trusted.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.Trusted.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.Trusted.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.XHTML.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.XHTML.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.XHTML.txt
diff --git a/library/HTMLPurifier/ConfigSchema/HTML.txt b/library/HTMLPurifier/ConfigSchema/schema/HTML.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/HTML.txt
rename to library/HTMLPurifier/ConfigSchema/schema/HTML.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Output.CommentScriptContents.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Output.CommentScriptContents.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Output.CommentScriptContents.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Output.Newline.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Output.Newline.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Output.Newline.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Output.TidyFormat.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Output.TidyFormat.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Output.TidyFormat.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Output.txt b/library/HTMLPurifier/ConfigSchema/schema/Output.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Output.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Output.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Test.ForceNoIconv.txt b/library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Test.ForceNoIconv.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Test.ForceNoIconv.txt
diff --git a/library/HTMLPurifier/ConfigSchema/Test.txt b/library/HTMLPurifier/ConfigSchema/schema/Test.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/Test.txt
rename to library/HTMLPurifier/ConfigSchema/schema/Test.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.AllowedSchemes.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.AllowedSchemes.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.AllowedSchemes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.Base.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.Base.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.Base.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.DefaultScheme.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.DefaultScheme.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.DefaultScheme.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.DefinitionID.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.DefinitionID.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionID.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.DefinitionRev.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.DefinitionRev.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.DefinitionRev.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.Disable.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.Disable.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.Disable.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.DisableExternal.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.DisableExternal.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternal.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.DisableExternalResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.DisableExternalResources.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.DisableExternalResources.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.DisableResources.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.DisableResources.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.DisableResources.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.Host.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.Host.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.Host.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.HostBlacklist.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.HostBlacklist.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.HostBlacklist.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.MakeAbsolute.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.MakeAbsolute.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.MakeAbsolute.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.Munge.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.Munge.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.Munge.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.OverrideAllowedSchemes.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.OverrideAllowedSchemes.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.OverrideAllowedSchemes.txt
diff --git a/library/HTMLPurifier/ConfigSchema/URI.txt b/library/HTMLPurifier/ConfigSchema/schema/URI.txt
similarity index 100%
rename from library/HTMLPurifier/ConfigSchema/URI.txt
rename to library/HTMLPurifier/ConfigSchema/schema/URI.txt
diff --git a/maintenance/generate-schema-cache.php b/maintenance/generate-schema-cache.php
index 642d1898..2677e394 100644
--- a/maintenance/generate-schema-cache.php
+++ b/maintenance/generate-schema-cache.php
@@ -15,7 +15,7 @@ assertCli();
 $target = '../library/HTMLPurifier/ConfigSchema/schema.ser';
 $FS = new FSTools();
 
-$files = $FS->globr('../library/HTMLPurifier/ConfigSchema', '*.txt');
+$files = $FS->globr('../library/HTMLPurifier/ConfigSchema/schema', '*.txt');
 
 $namespaces = array();
 $directives = array();