Filters broken out into their own package.

37 files changed, 98 insertions, 37 deletions

diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiControlOnlyStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilter.scala
index 893047f..e84b3bd 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiControlOnlyStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures only ASCII control characters matter. */
 trait AsciiControlOnlyStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiControlStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilter.scala
index 5320fcc..f9cb6a6 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiControlStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII controls do not matter. */
 trait AsciiControlStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterCaseStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilter.scala
index 02e30e3..a1be6bb 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterCaseStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII letter case-sensitivity does not matter. */
 trait AsciiLetterCaseStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterNumberOnlyStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilter.scala
index fad1d7f..4cd4ea0 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterNumberOnlyStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures only ASCII letters and numbers matter. */
 trait AsciiLetterNumberOnlyStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterNumberStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilter.scala
index e741b74..05e477c 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterNumberStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII letters and numbers do not matter. */
 trait AsciiLetterNumberStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterOnlyStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilter.scala
index 3ec29a2..c259126 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterOnlyStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures only ASCII letters matter. */
 trait AsciiLetterOnlyStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilter.scala
index ca2d013..4942f26 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiLetterStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII letters do not matter. */
 trait AsciiLetterStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiNumberOnlyStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilter.scala
index 9b133f6..02390a5 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiNumberOnlyStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures only ASCII numbers matter. */
 trait AsciiNumberOnlyStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiNumberStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilter.scala
index f460d31..6a5264c 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiNumberStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII numbers do not matter. */
 trait AsciiNumberStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiSpaceStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilter.scala
index 425cf13..1d0fc96 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiSpaceStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII spaces do not matter. */
 trait AsciiSpaceStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiSymbolOnlyStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilter.scala
index e81da87..4a58ff3 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiSymbolOnlyStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures only ASCII symbols matter. */
 trait AsciiSymbolOnlyStringFilter extends StringFilter {
diff --git a/core/source/core/scala/org/hashtree/stringmetric/AsciiSymbolStringFilter.scala b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilter.scala
index 0506bca..fce3667 100755
--- a/core/source/core/scala/org/hashtree/stringmetric/AsciiSymbolStringFilter.scala
+++ b/core/source/core/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilter.scala
@@ -1,4 +1,6 @@
-package org.hashtree.stringmetric
+package org.hashtree.stringmetric.filter
+
+import org.hashtree.stringmetric.StringFilter
 
 /** A decorator [[org.hashtree.stringmetric.StringFilter]]. Ensures ASCII symbols do not matter. */
 trait AsciiSymbolStringFilter extends StringFilter {
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 b82a8c7..c76a6e2 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.{ StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.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 6bdc130..f1bb840 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.{ StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ StringFilter, StringMetric }
+import org.hashtree.stringmetric.StringFilterDelegate
 
 /** An implementation of the Metaphone [[org.hashtree.stringmetric.StringMetric]]. */
 object MetaphoneMetric extends StringMetric {
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 67b9552..798a0f4 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.{ StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.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 e8f48d2..89b9bd9 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.{ StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ StringFilter, StringMetric }
+import org.hashtree.stringmetric.StringFilterDelegate
 
 /** An implementation of the NYSIIS [[org.hashtree.stringmetric.StringMetric]]. */
 object NysiisMetric extends StringMetric {
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 df03712..d453206 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.{ StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.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 7c5f012..9c7a7a0 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.{ StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ StringFilter, StringMetric }
+import org.hashtree.stringmetric.StringFilterDelegate
 
 /** An implementation of the refined Soundex [[org.hashtree.stringmetric.StringMetric]]. */
 object RefinedSoundexMetric extends StringMetric {
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 579e677..ca2e840 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.{ StringAlgorithm, StringFilter, StringFilterDelegate }
+import org.hashtree.stringmetric.{ StringAlgorithm, StringFilter }
+import org.hashtree.stringmetric.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 7cd9939..91d94ab 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.{ StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ StringFilter, StringMetric }
+import org.hashtree.stringmetric.StringFilterDelegate
 
 /** An implementation of the Soundex [[org.hashtree.stringmetric.StringMetric]]. */
 object SoundexMetric extends StringMetric {
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 b800fb7..5bf8509 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.{ CompareTuple, MatchTuple, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.StringFilterDelegate
 import scala.annotation.tailrec
 
 /** An implementation of the Dice, and Sorensen, [[org.hashtree.stringmetric.StringMetric]]. */
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 9e4951f..ec3de5c 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, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.StringFilterDelegate
 
 /** An implementation of the Hamming [[org.hashtree.stringmetric.StringMetric]]. */
 object HammingMetric extends StringMetric {
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 d5895a6..4363ba7 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, MatchTuple, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, MatchTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.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 53d1c40..98f6969 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.{ StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ StringFilter, StringMetric }
+import org.hashtree.stringmetric.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 7ac3974..df85da4 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, StringFilter, StringFilterDelegate, StringMetric }
+import org.hashtree.stringmetric.{ CompareTuple, StringFilter, StringMetric }
+import org.hashtree.stringmetric.StringFilterDelegate
 
 /** An implementation of the Levenshtein [[org.hashtree.stringmetric.StringMetric]]. */
 object LevenshteinMetric extends StringMetric {
diff --git a/core/source/test/scala/org/hashtree/stringmetric/AsciiControlOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
index 91ef72f..ef99b27 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiControlOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiControlStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
index fe0f501..6e4c722 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiControlStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiControlStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiLetterCaseStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
index e45e8de..60daf52 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiLetterCaseStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterCaseStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiLetterNumberOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
index fb77932..e50fae0 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiLetterNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiLetterNumberStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
index e1ab9c3..25caf98 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiLetterNumberStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiLetterOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
index 7360b72..fc67ccb 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiLetterOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiLetterStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
index 8ce70af..fec58fd 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiLetterStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiLetterStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiNumberOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
index c2becdc..97e1ab2 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiNumberStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
index 70b6605..55f8905 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiNumberStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiNumberStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
index 2a46bf3..0860fc2 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiSpaceStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiSymbolOnlyStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
index 429c486..fab4fb4 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiSymbolOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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/AsciiSymbolStringFilterSpec.scala b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
index 6c2c5df..32c98e4 100755
--- a/core/source/test/scala/org/hashtree/stringmetric/AsciiSymbolStringFilterSpec.scala
+++ b/core/source/test/scala/org/hashtree/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
@@ -1,5 +1,7 @@
-package org.hashtree.stringmetric
+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