diff --git a/.github/workflows/why2-test.yml b/.github/workflows/why2-test.yml
index 08fa74d..0b76f6d 100644
--- a/.github/workflows/why2-test.yml
+++ b/.github/workflows/why2-test.yml
@@ -14,7 +14,7 @@ jobs:
         os:  [ ubuntu-latest ]
         include:
           - os: ubuntu-latest
-            output: out/why2
+            output: out/why2-test
             configure: configure.sh
             build: build.sh
             
diff --git a/build.sh b/build.sh
index 166e626..20bd325 100644
--- a/build.sh
+++ b/build.sh
@@ -6,12 +6,12 @@
 rm -rf out/*
 
 # Variables
-testFile="src/test/main.c"
-sourceFiles="src/*.c"
+testFile="src/lib/test/main.c"
+sourceFiles="src/lib/*.c"
 includeFiles="include/*.h"
 
 compiler="cc"
-output="out/why2"
+testOutput="out/why2-test"
 installOutput="libwhy2.so"
 flags="-Wall -ljson-c -lcurl"
 includeDirectory="/usr/include/why2"
@@ -34,7 +34,7 @@ if [[ "$1" == "test" ]]; then ########## TEST ##########
     ###
 
     # Compile
-    $compiler $testFile $flags -o $output
+    $compiler $testFile $flags -o $testOutput
 
     # Compilation failed
     if [[ $? -ne 0 ]]; then
@@ -43,7 +43,7 @@ if [[ "$1" == "test" ]]; then ########## TEST ##########
     fi
 
     ###
-    echo "Output generated as '$output'"
+    echo "Output generated as '$testOutput'"
     ###
 elif [[ "$1" == "install" ]]; then ########## INSTALL ##########
     if [[ "$2" != "lib" ]]; then
diff --git a/src/decrypter.c b/src/lib/decrypter.c
similarity index 100%
rename from src/decrypter.c
rename to src/lib/decrypter.c
diff --git a/src/encrypter.c b/src/lib/encrypter.c
similarity index 100%
rename from src/encrypter.c
rename to src/lib/encrypter.c
diff --git a/src/flags.c b/src/lib/flags.c
similarity index 100%
rename from src/flags.c
rename to src/lib/flags.c
diff --git a/src/misc.c b/src/lib/misc.c
similarity index 100%
rename from src/misc.c
rename to src/lib/misc.c
diff --git a/src/test/main.c b/src/lib/test/main.c
similarity index 100%
rename from src/test/main.c
rename to src/lib/test/main.c