rename ReDoSUtil to NfaUtils, and rename the "performance" folder to "regexp"

java/ql/lib/semmle/code/java/security/regexp/ExponentialBackTracking.qll

@@ -62,7 +62,7 @@
  *     a suffix `x` (possible empty) that is most likely __not__ accepted.
  */
 
-import ReDoSUtil
+import NfaUtils
 
 /**
  * Holds if state `s` might be inside a backtracking repetition.

java/ql/lib/semmle/code/java/security/regexp/NfaUtils.qll

@@ -1,18 +1,13 @@
 /**
- * Provides classes for working with regular expressions that can
- * perform backtracking in superlinear/exponential time.
+ * Provides classes and predicates for constructing an NFA from
+ * a regular expression, and various utilities for reasoning about
+ * the resulting NFA.
  *
- * This module contains a number of utility predicates for compiling a regular expression into a NFA and reasoning about this NFA.
- *
- * The `ReDoSConfiguration` contains a `isReDoSCandidate` predicate that is used to
- * to determine which states the prefix/suffix search should happen on.
- * There is only meant to exist one `ReDoSConfiguration` at a time.
- *
- * The predicate `hasReDoSResult` outputs a de-duplicated set of
- * states that will cause backtracking (a rejecting suffix exists).
+ * These utilities are used both by the ReDoS queries and by
+ * other queries that benefit from reasoning about NFAs.
  */
 
-import ReDoSUtilSpecific
+import NfaUtilsSpecific
 
 /**
  * Gets the char after `c` (from a simplified ASCII table).

java/ql/lib/semmle/code/java/security/regexp/PolynomialReDoSQuery.qll

@@ -1,6 +1,6 @@
 /** Definitions and configurations for the Polynomial ReDoS query */
 
-import semmle.code.java.security.performance.SuperlinearBackTracking
+import semmle.code.java.security.regexp.SuperlinearBackTracking
 import semmle.code.java.dataflow.DataFlow
 import semmle.code.java.regex.RegexTreeView
 import semmle.code.java.regex.RegexFlowConfigs

java/ql/lib/semmle/code/java/security/regexp/SuperlinearBackTracking.qll

@@ -3,7 +3,7 @@
  * perform backtracking in superlinear time.
  */
 
-import ReDoSUtil
+import NfaUtils
 
 /*
  * This module implements the analysis described in the paper:

java/ql/src/Security/CWE/CWE-730/PolynomialReDoS.ql

@@ -13,7 +13,7 @@
  */
 
 import java
-import semmle.code.java.security.performance.PolynomialReDoSQuery
+import semmle.code.java.security.regexp.PolynomialReDoSQuery
 import DataFlow::PathGraph
 
 from DataFlow::PathNode source, DataFlow::PathNode sink, PolynomialBackTrackingTerm regexp

java/ql/src/Security/CWE/CWE-730/ReDoS.ql

@@ -14,7 +14,7 @@
  */
 
 import java
-import semmle.code.java.security.performance.ExponentialBackTracking
+import semmle.code.java.security.regexp.ExponentialBackTracking
 
 from RegExpTerm t, string pump, State s, string prefixMsg
 where

java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.ql

@@ -1,6 +1,6 @@
 import java
 import TestUtilities.InlineExpectationsTest
-import semmle.code.java.security.performance.PolynomialReDoSQuery
+import semmle.code.java.security.regexp.PolynomialReDoSQuery
 
 class HasPolyRedos extends InlineExpectationsTest {
   HasPolyRedos() { this = "HasPolyRedos" }

java/ql/test/query-tests/security/CWE-730/ReDoS.ql

@@ -1,6 +1,6 @@
 import java
 import TestUtilities.InlineExpectationsTest
-import semmle.code.java.security.performance.ExponentialBackTracking
+import semmle.code.java.security.regexp.ExponentialBackTracking
 import semmle.code.java.regex.regex
 
 class HasExpRedos extends InlineExpectationsTest {