diff --git a/src/main/org/openscience/cdk/hash/BasicAtomHashGenerator.java b/src/main/org/openscience/cdk/hash/BasicAtomHashGenerator.java
index 8a5bb7428e2..98bdeb8b7b7 100644
--- a/src/main/org/openscience/cdk/hash/BasicAtomHashGenerator.java
+++ b/src/main/org/openscience/cdk/hash/BasicAtomHashGenerator.java
@@ -27,7 +27,7 @@
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 /**
diff --git a/src/main/org/openscience/cdk/hash/HashGeneratorMaker.java b/src/main/org/openscience/cdk/hash/HashGeneratorMaker.java
index faf6ffaee96..28b3398870d 100644
--- a/src/main/org/openscience/cdk/hash/HashGeneratorMaker.java
+++ b/src/main/org/openscience/cdk/hash/HashGeneratorMaker.java
@@ -27,10 +27,10 @@
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
-import org.openscience.cdk.hash.stereo.factory.GeometricCumulativeDoubleBondFactory;
-import org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory;
-import org.openscience.cdk.hash.stereo.factory.GeometricTetrahedralEncoderFactory;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactory;
+import org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory;
+import org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 import java.util.ArrayList;
diff --git a/src/main/org/openscience/cdk/hash/PerturbedAtomHashGenerator.java b/src/main/org/openscience/cdk/hash/PerturbedAtomHashGenerator.java
index 4b610f5dd0d..9695cc4750b 100644
--- a/src/main/org/openscience/cdk/hash/PerturbedAtomHashGenerator.java
+++ b/src/main/org/openscience/cdk/hash/PerturbedAtomHashGenerator.java
@@ -27,7 +27,7 @@
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 import java.util.Arrays;
diff --git a/src/main/org/openscience/cdk/hash/stereo/factory/GeometricCumulativeDoubleBondFactory.java b/src/main/org/openscience/cdk/hash/stereo/GeometricCumulativeDoubleBondFactory.java
similarity index 98%
rename from src/main/org/openscience/cdk/hash/stereo/factory/GeometricCumulativeDoubleBondFactory.java
rename to src/main/org/openscience/cdk/hash/stereo/GeometricCumulativeDoubleBondFactory.java
index 18efbdcb44d..a38623909e2 100644
--- a/src/main/org/openscience/cdk/hash/stereo/factory/GeometricCumulativeDoubleBondFactory.java
+++ b/src/main/org/openscience/cdk/hash/stereo/GeometricCumulativeDoubleBondFactory.java
@@ -21,13 +21,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.hash.stereo.GeometryEncoder;
-import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.CombinedPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.GeometricParity;
@@ -54,7 +51,7 @@
  * @author John May
  * @cdk.module hash
  */
-@TestClass("org.openscience.cdk.hash.stereo.factory.GeometricCumulativeDoubleBondFactoryTest")
+@TestClass("org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactoryTest")
 public class GeometricCumulativeDoubleBondFactory
         implements StereoEncoderFactory {
 
diff --git a/src/main/org/openscience/cdk/hash/stereo/factory/GeometricDoubleBondEncoderFactory.java b/src/main/org/openscience/cdk/hash/stereo/GeometricDoubleBondEncoderFactory.java
similarity index 97%
rename from src/main/org/openscience/cdk/hash/stereo/factory/GeometricDoubleBondEncoderFactory.java
rename to src/main/org/openscience/cdk/hash/stereo/GeometricDoubleBondEncoderFactory.java
index 58f9e384d37..3c56493522c 100644
--- a/src/main/org/openscience/cdk/hash/stereo/factory/GeometricDoubleBondEncoderFactory.java
+++ b/src/main/org/openscience/cdk/hash/stereo/GeometricDoubleBondEncoderFactory.java
@@ -22,13 +22,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.hash.stereo.GeometryEncoder;
-import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.CombinedPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond2DParity;
@@ -64,7 +61,7 @@
  * @cdk.githash
  * @see org.openscience.cdk.hash.HashGeneratorMaker
  */
-@TestClass("org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactoryTest")
+@TestClass("org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactoryTest")
 public final class GeometricDoubleBondEncoderFactory
         implements StereoEncoderFactory {
 
diff --git a/src/main/org/openscience/cdk/hash/stereo/factory/GeometricTetrahedralEncoderFactory.java b/src/main/org/openscience/cdk/hash/stereo/GeometricTetrahedralEncoderFactory.java
similarity index 97%
rename from src/main/org/openscience/cdk/hash/stereo/factory/GeometricTetrahedralEncoderFactory.java
rename to src/main/org/openscience/cdk/hash/stereo/GeometricTetrahedralEncoderFactory.java
index 0dc236a0f52..d65ed625143 100644
--- a/src/main/org/openscience/cdk/hash/stereo/factory/GeometricTetrahedralEncoderFactory.java
+++ b/src/main/org/openscience/cdk/hash/stereo/GeometricTetrahedralEncoderFactory.java
@@ -22,13 +22,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.openscience.cdk.annotations.TestClass;
 import org.openscience.cdk.annotations.TestMethod;
-import org.openscience.cdk.hash.stereo.GeometryEncoder;
-import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.GeometricParity;
 import org.openscience.cdk.hash.stereo.parity.Tetrahedral2DParity;
@@ -58,7 +55,7 @@
  * @cdk.module hash
  * @cdk.githash
  */
-@TestClass("org.openscience.cdk.hash.stereo.factory.GeometricTetrahedralEncoderFactoryTest")
+@TestClass("org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactoryTest")
 public class GeometricTetrahedralEncoderFactory
         implements StereoEncoderFactory {
 
diff --git a/src/main/org/openscience/cdk/hash/stereo/factory/StereoEncoderFactory.java b/src/main/org/openscience/cdk/hash/stereo/StereoEncoderFactory.java
similarity index 95%
rename from src/main/org/openscience/cdk/hash/stereo/factory/StereoEncoderFactory.java
rename to src/main/org/openscience/cdk/hash/stereo/StereoEncoderFactory.java
index 8c8c5152a3f..8fc7908d2b6 100644
--- a/src/main/org/openscience/cdk/hash/stereo/factory/StereoEncoderFactory.java
+++ b/src/main/org/openscience/cdk/hash/stereo/StereoEncoderFactory.java
@@ -22,9 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
-import org.openscience.cdk.hash.stereo.StereoEncoder;
 import org.openscience.cdk.interfaces.IAtomContainer;
 
 /**
diff --git a/src/test/org/openscience/cdk/hash/HashGeneratorMakerTest.java b/src/test/org/openscience/cdk/hash/HashGeneratorMakerTest.java
index 42032ae5b4c..93df0a342b5 100644
--- a/src/test/org/openscience/cdk/hash/HashGeneratorMakerTest.java
+++ b/src/test/org/openscience/cdk/hash/HashGeneratorMakerTest.java
@@ -26,7 +26,7 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 
 import java.lang.reflect.Field;
 import java.util.Collections;
diff --git a/src/test/org/openscience/cdk/hash/PerturbedAtomHashGeneratorTest.java b/src/test/org/openscience/cdk/hash/PerturbedAtomHashGeneratorTest.java
index 2f98cb18a49..5d921351081 100644
--- a/src/test/org/openscience/cdk/hash/PerturbedAtomHashGeneratorTest.java
+++ b/src/test/org/openscience/cdk/hash/PerturbedAtomHashGeneratorTest.java
@@ -29,7 +29,7 @@
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.AtomContainer;
 import org.openscience.cdk.Bond;
-import org.openscience.cdk.hash.stereo.factory.StereoEncoderFactory;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
diff --git a/src/test/org/openscience/cdk/hash/stereo/factory/GeometricCumulativeDoubleBondFactoryTest.java b/src/test/org/openscience/cdk/hash/stereo/GeometricCumulativeDoubleBondFactoryTest.java
similarity index 96%
rename from src/test/org/openscience/cdk/hash/stereo/factory/GeometricCumulativeDoubleBondFactoryTest.java
rename to src/test/org/openscience/cdk/hash/stereo/GeometricCumulativeDoubleBondFactoryTest.java
index de79e5ea6c0..fd56f99d544 100644
--- a/src/test/org/openscience/cdk/hash/stereo/factory/GeometricCumulativeDoubleBondFactoryTest.java
+++ b/src/test/org/openscience/cdk/hash/stereo/GeometricCumulativeDoubleBondFactoryTest.java
@@ -21,14 +21,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.junit.Test;
 import org.openscience.cdk.Atom;
 import org.openscience.cdk.AtomContainer;
 import org.openscience.cdk.Bond;
+import org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactory;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.interfaces.IAtom;
 import org.openscience.cdk.interfaces.IAtomContainer;
 import org.openscience.cdk.interfaces.IBond;
diff --git a/src/test/org/openscience/cdk/hash/stereo/factory/GeometricDoubleBondEncoderFactoryTest.java b/src/test/org/openscience/cdk/hash/stereo/GeometricDoubleBondEncoderFactoryTest.java
similarity index 96%
rename from src/test/org/openscience/cdk/hash/stereo/factory/GeometricDoubleBondEncoderFactoryTest.java
rename to src/test/org/openscience/cdk/hash/stereo/GeometricDoubleBondEncoderFactoryTest.java
index cb57d7fe1fa..759335c9215 100644
--- a/src/test/org/openscience/cdk/hash/stereo/factory/GeometricDoubleBondEncoderFactoryTest.java
+++ b/src/test/org/openscience/cdk/hash/stereo/GeometricDoubleBondEncoderFactoryTest.java
@@ -22,11 +22,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.junit.Test;
+import org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
+import org.openscience.cdk.hash.stereo.StereoEncoderFactory;
 import org.openscience.cdk.hash.stereo.parity.BasicPermutationParity;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond2DParity;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond3DParity;
@@ -50,9 +52,9 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory.geometric;
-import static org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory.moveToBack;
-import static org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactory.permutation;
+import static org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory.geometric;
+import static org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory.moveToBack;
+import static org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactory.permutation;
 
 /**
  * @author John May
diff --git a/src/test/org/openscience/cdk/hash/stereo/factory/GeometricTetrahedralEncoderFactoryTest.java b/src/test/org/openscience/cdk/hash/stereo/GeometricTetrahedralEncoderFactoryTest.java
similarity index 99%
rename from src/test/org/openscience/cdk/hash/stereo/factory/GeometricTetrahedralEncoderFactoryTest.java
rename to src/test/org/openscience/cdk/hash/stereo/GeometricTetrahedralEncoderFactoryTest.java
index 3ee3eda7bc4..6c790799f61 100644
--- a/src/test/org/openscience/cdk/hash/stereo/factory/GeometricTetrahedralEncoderFactoryTest.java
+++ b/src/test/org/openscience/cdk/hash/stereo/GeometricTetrahedralEncoderFactoryTest.java
@@ -22,10 +22,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
  */
 
-package org.openscience.cdk.hash.stereo.factory;
+package org.openscience.cdk.hash.stereo;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
+import org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactory;
 import org.openscience.cdk.hash.stereo.GeometryEncoder;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoder;
 import org.openscience.cdk.hash.stereo.StereoEncoder;
diff --git a/src/test/org/openscience/cdk/modulesuites/MhashTests.java b/src/test/org/openscience/cdk/modulesuites/MhashTests.java
index c376300f51e..30b400863a4 100644
--- a/src/test/org/openscience/cdk/modulesuites/MhashTests.java
+++ b/src/test/org/openscience/cdk/modulesuites/MhashTests.java
@@ -35,9 +35,9 @@
 import org.openscience.cdk.hash.stereo.BasicPermutationParityTest;
 import org.openscience.cdk.hash.stereo.GeometryEncoderTest;
 import org.openscience.cdk.hash.stereo.MultiStereoEncoderTest;
-import org.openscience.cdk.hash.stereo.factory.GeometricCumulativeDoubleBondFactoryTest;
-import org.openscience.cdk.hash.stereo.factory.GeometricDoubleBondEncoderFactoryTest;
-import org.openscience.cdk.hash.stereo.factory.GeometricTetrahedralEncoderFactoryTest;
+import org.openscience.cdk.hash.stereo.GeometricCumulativeDoubleBondFactoryTest;
+import org.openscience.cdk.hash.stereo.GeometricDoubleBondEncoderFactoryTest;
+import org.openscience.cdk.hash.stereo.GeometricTetrahedralEncoderFactoryTest;
 import org.openscience.cdk.hash.stereo.parity.CombinedPermutationParityTest;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond2DParityTest;
 import org.openscience.cdk.hash.stereo.parity.DoubleBond3DParityTest;