diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1446fc721..03342bff2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Cache LLVM and Clang
+      - name: Cache LLVM
         id: cache-llvm
         uses: actions/cache@v2
         with:
@@ -33,7 +33,6 @@ jobs:
           cd ./llvm-project-llvmorg-12.0.1/build
           cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS_RELEASE="-O2" -G "Unix Makefiles" ../llvm
           cmake --build .
-          export LLVM_DIR=/home/runner/work/spice/llvm/llvm-project-llvmorg-12.0.1/build/lib/cmake/llvm
 
       - name: Download Libs
         run: |
@@ -43,6 +42,8 @@ jobs:
           git clone https://github.com/antlr/antlr4.git
 
       - name: Build
+        env:
+          LLVM_DIR: /home/runner/work/spice/llvm/llvm-project-llvmorg-12.0.1/build/lib/cmake/llvm
         run: |
           mkdir bin
           cd bin
diff --git a/compiler/src/CMakeLists.txt b/compiler/src/CMakeLists.txt
index 1e53542e5..7111fe465 100644
--- a/compiler/src/CMakeLists.txt
+++ b/compiler/src/CMakeLists.txt
@@ -27,8 +27,8 @@ set(SOURCES
         analyzer/SymbolTable.h
         analyzer/SymbolTableEntry.cpp
         analyzer/SymbolTableEntry.h
-        ir/GeneratorVisitor.cpp
-        ir/GeneratorVisitor.h
+        generator/GeneratorVisitor.cpp
+        generator/GeneratorVisitor.h
         exception/SemanticError.cpp
         exception/SemanticError.h
         exception/IRError.cpp
diff --git a/compiler/src/ir/GeneratorVisitor.cpp b/compiler/src/generator/GeneratorVisitor.cpp
similarity index 100%
rename from compiler/src/ir/GeneratorVisitor.cpp
rename to compiler/src/generator/GeneratorVisitor.cpp
diff --git a/compiler/src/ir/GeneratorVisitor.h b/compiler/src/generator/GeneratorVisitor.h
similarity index 100%
rename from compiler/src/ir/GeneratorVisitor.h
rename to compiler/src/generator/GeneratorVisitor.h
diff --git a/compiler/src/main.cpp b/compiler/src/main.cpp
index 6722aa2b8..6fb2363d9 100644
--- a/compiler/src/main.cpp
+++ b/compiler/src/main.cpp
@@ -5,7 +5,7 @@
 #include "SpiceLexer.h"
 #include "SpiceParser.h"
 #include "analyzer/AnalyzerVisitor.h"
-#include "ir/GeneratorVisitor.h"
+#include "generator/GeneratorVisitor.h"
 
 using namespace antlr4;