diff --git a/language.cabal b/language.cabal
index bddbd21..6a89860 100644
--- a/language.cabal
+++ b/language.cabal
@@ -38,8 +38,8 @@ executable language
       TypeChecker
       TypeCheckerIr
 --      Interpreter
-      Compiler
-      LlvmIr
+      Codegen.Codegen
+      Codegen.LlvmIr
     hs-source-dirs:   src
 
     build-depends:    
diff --git a/src/Compiler.hs b/src/Codegen/Codegen.hs
similarity index 99%
rename from src/Compiler.hs
rename to src/Codegen/Codegen.hs
index b6bc408..b32f73f 100644
--- a/src/Compiler.hs
+++ b/src/Codegen/Codegen.hs
@@ -1,9 +1,13 @@
 {-# LANGUAGE LambdaCase        #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Compiler (compile) where
+module Codegen.Codegen (compile) where
 
 import           Auxiliary            (snoc)
+import           Codegen.LlvmIr       (CallingConvention (..), LLVMComp (..),
+                                       LLVMIr (..), LLVMType (..),
+                                       LLVMValue (..), Visibility (..),
+                                       llvmIrToString)
 import           Control.Monad.State  (StateT, execStateT, foldM, foldM_, gets,
                                        modify)
 import qualified Data.Bifunctor       as BI
@@ -14,10 +18,6 @@ import qualified Data.Map             as Map
 import           Data.Tuple.Extra     (dupe, first, second)
 import qualified Grammar.Abs          as GA
 import           Grammar.ErrM         (Err)
-import           LlvmIr               (CallingConvention (..), LLVMComp (..),
-                                       LLVMIr (..), LLVMType (..),
-                                       LLVMValue (..), Visibility (..),
-                                       llvmIrToString)
 import           System.Process.Extra (readCreateProcess, shell)
 import           TypeCheckerIr        (Bind (..), Case (..), Exp (..), Id,
                                        Ident (..), Program (..), Type (..))
diff --git a/src/LlvmIr.hs b/src/Codegen/LlvmIr.hs
similarity index 99%
rename from src/LlvmIr.hs
rename to src/Codegen/LlvmIr.hs
index f0cbf12..e412273 100644
--- a/src/LlvmIr.hs
+++ b/src/Codegen/LlvmIr.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE LambdaCase #-}
 
-module LlvmIr (
+module Codegen.LlvmIr (
     LLVMType (..),
     LLVMIr (..),
     llvmIrToString,
diff --git a/src/Main.hs b/src/Main.hs
index 29b7158..313d952 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -2,7 +2,7 @@
 
 module Main where
 
-import           Compiler             (compile)
+import           Codegen.Codegen      (compile)
 import           GHC.IO.Handle.Text   (hPutStrLn)
 import           Grammar.ErrM         (Err)
 import           Grammar.Par          (myLexer, pProgram)