Moved StringFilterDelegate into filter package, as it is essentially a concretion.

47 files changed, 55 insertions, 62 deletions

diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala
index fc23695..29095c0 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneAlgorithm.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.MetaphoneAlgorithm
 
@@ -46,6 +45,6 @@ object metaphoneAlgorithm extends Command {
 		println(
 			MetaphoneAlgorithm.compute(
 				options('dashless)
-			)(new StringFilterDelegate).getOrElse("not computable").toString
+			).getOrElse("not computable").toString
 		)
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala
index 683fc9e..24c58b4 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/metaphoneMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.MetaphoneMetric
 
@@ -49,7 +48,7 @@ object metaphoneMetric extends Command {
 			MetaphoneMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala
index c9c9656..2cb2888 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisAlgorithm.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.NysiisAlgorithm
 
@@ -46,6 +45,6 @@ object nysiisAlgorithm extends Command {
 		println(
 			NysiisAlgorithm.compute(
 				options('dashless)
-			)(new StringFilterDelegate).getOrElse("not computable").toString
+			).getOrElse("not computable").toString
 		)
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala
index da83a35..cbac34d 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/nysiisMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.NysiisMetric
 
@@ -49,7 +48,7 @@ object nysiisMetric extends Command {
 			NysiisMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala
index 00c7900..30da5d3 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexAlgorithm.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.RefinedSoundexAlgorithm
 
@@ -46,6 +45,6 @@ object refinedSoundexAlgorithm extends Command {
 		println(
 			RefinedSoundexAlgorithm.compute(
 				options('dashless)
-			)(new StringFilterDelegate).getOrElse("not computable").toString
+			).getOrElse("not computable").toString
 		)
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala
index 9a504b5..c2a1f67 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/refinedSoundexMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.RefinedSoundexMetric
 
@@ -49,7 +48,7 @@ object refinedSoundexMetric extends Command {
 			RefinedSoundexMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala
index 64b4997..4144800 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexAlgorithm.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.SoundexAlgorithm
 
@@ -46,6 +45,6 @@ object soundexAlgorithm extends Command {
 		println(
 			SoundexAlgorithm.compute(
 				options('dashless)
-			)(new StringFilterDelegate).getOrElse("not computable").toString
+			).getOrElse("not computable").toString
 		)
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala
index a06db9a..db9632d 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/phonetic/soundexMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.phonetic
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.phonetic.SoundexMetric
 
@@ -49,7 +48,7 @@ object soundexMetric extends Command {
 			SoundexMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala
index 3c5a8b1..5d6590c 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/diceSorensenMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.DiceSorensenMetric
 
@@ -54,7 +53,7 @@ object diceSorensenMetric extends Command {
 			DiceSorensenMetric.compare(
 				strings(0),
 				strings(1)
-			)(n)(new StringFilterDelegate).getOrElse("not comparable").toString
+			)(n).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala
index fc3b476..77af8b5 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/hammingMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.HammingMetric
 
@@ -49,7 +48,7 @@ object hammingMetric extends Command {
 			HammingMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala
index 64979ba..43a05ac 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.JaroMetric
 
@@ -46,7 +45,7 @@ object jaroMetric extends Command {
 			JaroMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala
index 09d875b..76549c0 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/jaroWinklerMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.JaroWinklerMetric
 
@@ -49,7 +48,7 @@ object jaroWinklerMetric extends Command {
 			JaroWinklerMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala
index 900edc0..cfc193b 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/levenshteinMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.LevenshteinMetric
 
@@ -50,7 +49,7 @@ object levenshteinMetric extends Command {
 			LevenshteinMetric.compare(
 				strings(0),
 				strings(1)
-			)(new StringFilterDelegate).getOrElse("not comparable").toString
+			).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala
index 3aae788..555efbf 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramAlgorithm.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.NGramAlgorithm
 
@@ -47,7 +46,7 @@ object nGramAlgorithm extends Command {
 
 	override def execute(options: OptionMap): Unit = {
 		val n = ParseUtility.parseInt(options('n)).get
-		val ngram = NGramAlgorithm.compute(options('dashless))(n)(new StringFilterDelegate)
+		val ngram = NGramAlgorithm.compute(options('dashless))(n)
 
 		ngram match {
 			case Some(a) => println(a.mkString("|"))
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala
index 964a11a..eeb574a 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/nGramMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.NGramMetric
 
@@ -54,7 +53,7 @@ object nGramMetric extends Command {
 			NGramMetric.compare(
 				strings(0),
 				strings(1)
-			)(n)(new StringFilterDelegate).getOrElse("not comparable").toString
+			)(n).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala
index 60056e3..1e686f7 100755
--- a/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala
+++ b/cli/source/core/scala/org/hashtree/stringmetric/cli/similarity/weightedLevenshteinMetric.scala
@@ -1,6 +1,5 @@
 package org.hashtree.stringmetric.cli.similarity
 
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.hashtree.stringmetric.cli._
 import org.hashtree.stringmetric.similarity.WeightedLevenshteinMetric
 import scala.math.BigDecimal
@@ -67,7 +66,7 @@ object weightedLevenshteinMetric extends Command {
 			WeightedLevenshteinMetric.compare(
 				strings(0),
 				strings(1)
-			)(weights)(new StringFilterDelegate).getOrElse("not comparable").toString
+			)(weights).getOrElse("not comparable").toString
 		)
 	}
 }
\ No newline at end of file
diff --git a/core/source/core/scala/org/hashtree/stringmetric/StringFilterDelegate.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/StringFilterDelegate.scala
index e5154b4..b29db70 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/StringFilterDelegate.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/StringFilterDelegate.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 class StringFilterDelegate extends StringFilter {
 	override def filter(charArray: Array[Char]): Array[Char] = charArray
diff --git a/core/source/core/scala/org/hashtree/stringmetric/package.scala b/core/source/core/scala/org/hashtree/stringmetric/package.scala
index e46661f..1fb4ac3 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/package.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/package.scala
@@ -1,5 +1,7 @@
 package org.hashtree
 
+import org.hashtree.stringmetric.filter.StringFilterDelegate
+
 /** Provides core string metric functionality. */
 package object stringmetric {
 	type CompareTuple[T] = Tuple2[Array[T], Array[T]]
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala
index 0387c86..bd60637 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneAlgorithm.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.annotation.tailrec
 
 /** An implementation of the Metaphone [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala
index 71125f5..7cfc23a 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/MetaphoneMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /** An implementation of the Metaphone [[org.hashtree.stringmetric.StringMetric]]. */
 object MetaphoneMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala
index 09a4c40..020df3d 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisAlgorithm.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.annotation.tailrec
 
 /** An implementation of the NYSIIS [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala
index a27bbe0..a7c84e0 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/NysiisMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /** An implementation of the NYSIIS [[org.hashtree.stringmetric.StringMetric]]. */
 object NysiisMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala
index 1eec7ed..7f2191a 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexAlgorithm.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.annotation.tailrec
 
 /** An implementation of the refined Soundex [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala
index 0e1c3d9..326b654 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/RefinedSoundexMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /** An implementation of the refined Soundex [[org.hashtree.stringmetric.StringMetric]]. */
 object RefinedSoundexMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala
index 57477cf..648edc7 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexAlgorithm.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.annotation.tailrec
 
 /** An implementation of the Soundex [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala
index 0644f1e..a111df4 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/phonetic/SoundexMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.phonetic
 
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /** An implementation of the Soundex [[org.hashtree.stringmetric.StringMetric]]. */
 object SoundexMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala
index c800c77..2fed038 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/DiceSorensenMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /**
  * An implementation of the Dice, and lesser known Sorensen, [[org.hashtree.stringmetric.StringMetric]]. This
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala
index 6ebc9f2..e10cfad 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/HammingMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /** An implementation of the Hamming [[org.hashtree.stringmetric.StringMetric]]. */
 object HammingMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala
index 0ed8030..92a373e 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, MatchTuple, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.collection.mutable.{ ArrayBuffer, HashSet }
 
 /**
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala
index fcbbd41..49ff5cf 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/JaroWinklerMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /**
  * An implementation of the Jaro-Winkler [[org.hashtree.stringmetric.StringMetric]]. One differing detail in this
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala
index 1d115b3..d91fb37 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/LevenshteinMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 
 /** An implementation of the Levenshtein [[org.hashtree.stringmetric.StringMetric]]. */
 object LevenshteinMetric extends StringMetric with FilterableStringMetric {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala
index cd1ea5f..977f857 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramAlgorithm.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ FilterableConfigurableStringAlgorithm, StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableConfigurableStringAlgorithm, StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.annotation.tailrec
 
 /** An implementation of the N-Gram [[org.hashtree.stringmetric.StringAlgorithm]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala
index fde161c..4fe581c 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/NGramMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric, StringFilterDelegate }
+import org.hashtree.stringmetric.{ FilterableConfigurableStringMetric, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.math
 
 /** An implementation of the N-Gram [[org.hashtree.stringmetric.StringMetric]]. */
diff --git a/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala b/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala
index fab9476..63ae527 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/similarity/WeightedLevenshteinMetric.scala
@@ -1,6 +1,7 @@
 package org.hashtree.stringmetric.similarity
 
-import org.hashtree.stringmetric.{ CompareTuple, FilterableConfigurableStringMetric, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, FilterableConfigurableStringMetric, StringFilter, StringMetric }
+import org.hashtree.stringmetric.filter.StringFilterDelegate
 import scala.math.BigDecimal
 
 /** An implementation of a weighted Levenshtein [[org.hashtree.stringmetric.StringMetric]]. */
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
index ef99b27..e6d24fc 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
index 6e4c722..292f5ec 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
index 60daf52..86fe2c5 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
index e50fae0..6619825 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
index 25caf98..14929c8 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
index fc67ccb..b3352e8 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
index fec58fd..7e03cba 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
index 97e1ab2..c7d6103 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
index 55f8905..f86db83 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
index 0860fc2..8f5b9cd 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
index fab4fb4..167ae8a 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
index 32c98e4..1948a74 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
@@ -1,7 +1,6 @@
 package org.hashtree.stringmetric.filter
 
 import org.hashtree.stringmetric.ScalaTest
-import org.hashtree.stringmetric.StringFilterDelegate
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
diff --git a/core/source/test/scala/org/hashtree/stringmetric/StringFilterDelegateSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/StringFilterDelegateSpec.scala
index 7b1b3c6..ed98482 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/StringFilterDelegateSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/StringFilterDelegateSpec.scala
@@ -1,5 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
 
+import org.hashtree.stringmetric.ScalaTest
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner