diff --git a/semantic-diff.cabal b/semantic-diff.cabal
index b71b5c9ed..734f3e7f6 100644
--- a/semantic-diff.cabal
+++ b/semantic-diff.cabal
@@ -43,6 +43,8 @@ library
                      , Data.Term
                      , Decorator
                      , Diffing.Algorithm
+                     , Diffing.Algorithm.RWS
+                     , Diffing.Algorithm.RWS.FeatureVector
                      , Diffing.Algorithm.SES
                      , Diffing.Interpreter
                      , Files
@@ -71,8 +73,6 @@ library
                      , Renderer.SExpression
                      , Renderer.Tag
                      , Renderer.TOC
-                     , RWS
-                     , RWS.FeatureVector
                      , Semantic
                      , Semantic.Log
                      , Semantic.Stat
diff --git a/src/RWS.hs b/src/Diffing/Algorithm/RWS.hs
similarity index 99%
rename from src/RWS.hs
rename to src/Diffing/Algorithm/RWS.hs
index c6e99f455..542638dd9 100644
--- a/src/RWS.hs
+++ b/src/Diffing/Algorithm/RWS.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE GADTs, DataKinds, RankNTypes, TypeOperators #-}
-module RWS
+module Diffing.Algorithm.RWS
 ( rws
 , Options(..)
 , defaultOptions
@@ -32,8 +32,8 @@ import Data.Semigroup hiding (First(..))
 import Data.Term as Term
 import Data.These
 import Data.Traversable
+import Diffing.Algorithm.RWS.FeatureVector
 import Diffing.Algorithm.SES
-import RWS.FeatureVector
 
 type Label f fields label = forall b. TermF f (Record fields) b -> label
 
diff --git a/src/RWS/FeatureVector.hs b/src/Diffing/Algorithm/RWS/FeatureVector.hs
similarity index 98%
rename from src/RWS/FeatureVector.hs
rename to src/Diffing/Algorithm/RWS/FeatureVector.hs
index dc9ac5e76..ce8a14b65 100644
--- a/src/RWS/FeatureVector.hs
+++ b/src/Diffing/Algorithm/RWS/FeatureVector.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE BangPatterns, MagicHash #-}
-module RWS.FeatureVector
+module Diffing.Algorithm.RWS.FeatureVector
 ( FeatureVector
 , unFV
 , unitVector
diff --git a/src/Diffing/Interpreter.hs b/src/Diffing/Interpreter.hs
index e84fd7ebb..a02468f15 100644
--- a/src/Diffing/Interpreter.hs
+++ b/src/Diffing/Interpreter.hs
@@ -16,8 +16,8 @@ import Data.Record
 import Data.Term
 import Data.Text (Text)
 import Decorator
+import Diffing.Algorithm.RWS
 import Info hiding (Empty, Return)
-import RWS
 import Syntax (Syntax(Leaf))
 
 
diff --git a/test/Data/Functor/Listable.hs b/test/Data/Functor/Listable.hs
index 2e8ae1e13..2b6bf5e51 100644
--- a/test/Data/Functor/Listable.hs
+++ b/test/Data/Functor/Listable.hs
@@ -50,8 +50,8 @@ import Data.Text as T (Text, pack)
 import qualified Data.Text.Encoding as T
 import Data.These
 import Data.Union
+import Diffing.Algorithm.RWS
 import Renderer.TOC
-import RWS
 import Syntax as S
 import Test.LeanCheck
 import qualified Language
diff --git a/test/Data/RandomWalkSimilarity/Spec.hs b/test/Data/RandomWalkSimilarity/Spec.hs
index 1fdb4ac38..c03527ee6 100644
--- a/test/Data/RandomWalkSimilarity/Spec.hs
+++ b/test/Data/RandomWalkSimilarity/Spec.hs
@@ -12,8 +12,8 @@ import Data.Term
 import Data.These
 import Data.Union
 import Decorator
+import Diffing.Algorithm.RWS
 import Diffing.Interpreter
-import RWS
 import Test.Hspec
 import Test.Hspec.LeanCheck
 
diff --git a/test/TOCSpec.hs b/test/TOCSpec.hs
index 0280bbea4..ec5ac78fc 100644
--- a/test/TOCSpec.hs
+++ b/test/TOCSpec.hs
@@ -23,12 +23,12 @@ import Data.Term
 import Data.Text (Text)
 import Data.These
 import Info hiding (Go)
+import Diffing.Algorithm.RWS
 import Diffing.Interpreter
 import Language
 import Prelude hiding (readFile)
 import Renderer
 import Renderer.TOC
-import RWS
 import Semantic
 import Semantic.Task
 import Semantic.Util