diff --git a/semantic-diff.cabal b/semantic-diff.cabal
index 67befa13b..52649ada9 100644
--- a/semantic-diff.cabal
+++ b/semantic-diff.cabal
@@ -36,6 +36,7 @@ library
                      , Control.Monad.Effect.Cache
                      , Control.Monad.Effect.Dead
                      , Control.Monad.Effect.Env
+                     , Control.Monad.Effect.Evaluatable
                      , Control.Monad.Effect.Fresh
                      , Control.Monad.Effect.GC
                      , Control.Monad.Effect.NonDet
@@ -46,7 +47,6 @@ library
                      , Data.Abstract.Configuration
                      , Data.Abstract.Environment
                      , Data.Abstract.Linker
-                     , Data.Abstract.Evaluatable
                      , Data.Abstract.FreeVariables
                      , Data.Abstract.Live
                      , Data.Abstract.Store
diff --git a/src/Analysis/Abstract/Evaluating.hs b/src/Analysis/Abstract/Evaluating.hs
index fc98cce05..59c833e55 100644
--- a/src/Analysis/Abstract/Evaluating.hs
+++ b/src/Analysis/Abstract/Evaluating.hs
@@ -7,7 +7,7 @@ import Control.Monad.Effect.Fail
 import Control.Monad.Effect.State
 import Control.Monad.Effect.Reader
 import Data.Abstract.Linker
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.Store
 import Data.Abstract.Value
 import Data.Function (fix)
diff --git a/src/Data/Abstract/Evaluatable.hs b/src/Control/Monad/Effect/Evaluatable.hs
similarity index 98%
rename from src/Data/Abstract/Evaluatable.hs
rename to src/Control/Monad/Effect/Evaluatable.hs
index 7148cd233..8037bca9a 100644
--- a/src/Data/Abstract/Evaluatable.hs
+++ b/src/Control/Monad/Effect/Evaluatable.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE MultiParamTypeClasses, Rank2Types, GADTs, TypeOperators, DefaultSignatures, UndecidableInstances, ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-module Data.Abstract.Evaluatable
+module Control.Monad.Effect.Evaluatable
 ( Evaluatable(..)
 , step
 , Linker
diff --git a/src/Data/Syntax.hs b/src/Data/Syntax.hs
index b5ebb0fd1..1162b4c32 100644
--- a/src/Data/Syntax.hs
+++ b/src/Data/Syntax.hs
@@ -9,7 +9,7 @@ import Control.Monad.Effect.Reader
 import Control.Monad.Effect.State
 import Control.Monad.Error.Class hiding (Error)
 import Data.Abstract.Environment
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Value (LocationFor, EnvironmentFor, StoreFor, AbstractValue(..), Value)
 import Data.Align.Generic
diff --git a/src/Data/Syntax/Comment.hs b/src/Data/Syntax/Comment.hs
index a3b322888..2011567f3 100644
--- a/src/Data/Syntax/Comment.hs
+++ b/src/Data/Syntax/Comment.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveAnyClass, MultiParamTypeClasses #-}
 module Data.Syntax.Comment where
 
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Value as Value
 import Data.Align.Generic
diff --git a/src/Data/Syntax/Declaration.hs b/src/Data/Syntax/Declaration.hs
index 1362bbc85..8a03ead58 100644
--- a/src/Data/Syntax/Declaration.hs
+++ b/src/Data/Syntax/Declaration.hs
@@ -9,7 +9,7 @@ import Control.Monad.Effect.Reader
 import Control.Monad.Effect.State
 import Data.Abstract.Address
 import Data.Abstract.Environment
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Value
 import Data.Align.Generic
diff --git a/src/Data/Syntax/Expression.hs b/src/Data/Syntax/Expression.hs
index 1676b170a..5d618991a 100644
--- a/src/Data/Syntax/Expression.hs
+++ b/src/Data/Syntax/Expression.hs
@@ -8,7 +8,7 @@ import Control.Monad.Effect.Reader
 import Control.Monad.Effect.State
 import Data.Abstract.Address
 import Data.Abstract.Environment
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Type as Type
 import Data.Abstract.Value (Value, Closure(..), EnvironmentFor, StoreFor)
diff --git a/src/Data/Syntax/Literal.hs b/src/Data/Syntax/Literal.hs
index 9a27497b6..2e2ed5b56 100644
--- a/src/Data/Syntax/Literal.hs
+++ b/src/Data/Syntax/Literal.hs
@@ -2,7 +2,7 @@
 module Data.Syntax.Literal where
 
 import Control.Monad.Effect.Fail
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Value (AbstractValue(..))
 import Data.Align.Generic
diff --git a/src/Data/Syntax/Statement.hs b/src/Data/Syntax/Statement.hs
index 8c379832f..c02026679 100644
--- a/src/Data/Syntax/Statement.hs
+++ b/src/Data/Syntax/Statement.hs
@@ -8,7 +8,7 @@ import Control.Monad.Effect.State
 import Data.Abstract.Address
 import Data.Abstract.Environment
 import Data.Abstract.Store
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Value
 import Data.Align.Generic
diff --git a/src/Data/Syntax/Type.hs b/src/Data/Syntax/Type.hs
index af9829795..66307647e 100644
--- a/src/Data/Syntax/Type.hs
+++ b/src/Data/Syntax/Type.hs
@@ -2,7 +2,7 @@
 module Data.Syntax.Type where
 
 import Control.Monad.Effect.Fail
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Align.Generic
 import Data.Functor.Classes.Generic
diff --git a/src/Language/Python/Syntax.hs b/src/Language/Python/Syntax.hs
index a61e039b9..c8f9ca3e4 100644
--- a/src/Language/Python/Syntax.hs
+++ b/src/Language/Python/Syntax.hs
@@ -2,7 +2,7 @@
 module Language.Python.Syntax where
 
 import Control.Monad.Effect.Fail
-import Data.Abstract.Evaluatable
+import Control.Monad.Effect.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Align.Generic
 import Data.Functor.Classes.Generic