diff --git a/.gitignore b/.gitignore
index 09e5455..3b91ada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ Makefile
 # Generated files
 *.log
 *.out
+.cache/
 
 # macOS
 .DS_Store
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 184c923..50b1137 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,56 +1,78 @@
 cmake_minimum_required(VERSION 3.30)
 project(camellya)
 
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+option(CAMELLYA_BUILD_TESTS "Build tests" ON)
+option(CAMELLYA_BUILD_STATIC "Build static library" ON)
+option(CAMELLYA_BUILD_CLI "Build command line interface" ON)
 
 # Library sources
 set(LIB_SOURCES
-    library.cpp
-    lexer.cpp
-    parser.cpp
-    value.cpp
-    interpreter.cpp
-    state.cpp
+    src/lexer.cpp
+    src/parser.cpp
+    src/value.cpp
+    src/interpreter.cpp
+    src/state.cpp
 )
 
+# Library headers
 set(LIB_HEADERS
-    library.h
-    lexer.h
-    parser.h
-    ast.h
-    value.h
-    interpreter.h
-    state.h
+    src/camellya.h
+    src/lexer.h
+    src/parser.h
+    src/ast.h
+    src/value.h
+    src/interpreter.h
+    src/state.h
 )
 
-# Build static library
-add_library(camellya STATIC ${LIB_SOURCES} ${LIB_HEADERS})
+if(CAMELLYA_BUILD_STATIC)
+    add_library(libcamellya STATIC ${LIB_SOURCES} ${LIB_HEADERS})
+elseif()
+    add_library(libcamellya SHARED ${LIB_SOURCES} ${LIB_HEADERS})
+endif()
 
-include(FetchContent)
+target_include_directories(libcamellya PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
-FetchContent_Declare(
-    Catch2
-    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG v3.6.0
-)
+if(CAMELLYA_BUILD_CLI)
+    add_executable(camellya
+        cli/main.cpp
+    )
+    target_link_libraries(camellya
+        PRIVATE
+            libcamellya
+    )
+endif()
 
-FetchContent_MakeAvailable(Catch2)
+if(CAMELLYA_BUILD_TESTS)
+    include(FetchContent)
 
-enable_testing()
+    FetchContent_Declare(
+        Catch2
+        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+        GIT_TAG v3.12.0
+    )
 
-add_executable(camellya_tests
-    tests/test_basic.cpp
-)
+    FetchContent_MakeAvailable(Catch2)
 
-target_include_directories(camellya_tests
-    PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
+    enable_testing()
 
-target_link_libraries(camellya_tests
-    PRIVATE
-        camellya
-        Catch2::Catch2WithMain
-)
+    add_executable(camellya_tests
+        tests/test_basic.cpp
+    )
 
-add_test(NAME camellya_tests COMMAND camellya_tests)
\ No newline at end of file
+    target_include_directories(camellya_tests
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
+    target_link_libraries(camellya_tests
+        PRIVATE
+            libcamellya
+            Catch2::Catch2WithMain
+    )
+
+    add_test(NAME camellya_tests COMMAND camellya_tests)
+endif()
diff --git a/cli/main.cpp b/cli/main.cpp
new file mode 100644
index 0000000..efc6b19
--- /dev/null
+++ b/cli/main.cpp
@@ -0,0 +1,18 @@
+#include "camellya.h"
+#include <iostream>
+#include <format>
+#include <chrono>
+
+int main(int argc, char** argv) {
+    if(argc < 2){
+        std::cout << std::format("Usage: camellya <script> \n") << std::endl;
+        return 0;
+    }
+    std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
+    camellya::State state;
+    state.do_file(argv[1]);
+    std::chrono::high_resolution_clock::time_point end = std::chrono::high_resolution_clock::now();
+    std::chrono::duration<double> duration = end - start;
+    std::cout << std::format("Execution completed in {} seconds. \n", duration.count()) << std::endl;
+    return 0;
+}
diff --git a/library.cpp b/library.cpp
deleted file mode 100644
index ec9afd2..0000000
--- a/library.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "library.h"
-
-// Implementation file for Camellya scripting language
-// All implementation is in separate source files
\ No newline at end of file
diff --git a/README.md b/src/README.md
similarity index 100%
rename from README.md
rename to src/README.md
diff --git a/ast.h b/src/ast.h
similarity index 100%
rename from ast.h
rename to src/ast.h
diff --git a/library.h b/src/camellya.h
similarity index 100%
rename from library.h
rename to src/camellya.h
diff --git a/interpreter.cpp b/src/interpreter.cpp
similarity index 100%
rename from interpreter.cpp
rename to src/interpreter.cpp
diff --git a/interpreter.h b/src/interpreter.h
similarity index 100%
rename from interpreter.h
rename to src/interpreter.h
diff --git a/lexer.cpp b/src/lexer.cpp
similarity index 100%
rename from lexer.cpp
rename to src/lexer.cpp
diff --git a/lexer.h b/src/lexer.h
similarity index 100%
rename from lexer.h
rename to src/lexer.h
diff --git a/parser.cpp b/src/parser.cpp
similarity index 100%
rename from parser.cpp
rename to src/parser.cpp
diff --git a/parser.h b/src/parser.h
similarity index 100%
rename from parser.h
rename to src/parser.h
diff --git a/state.cpp b/src/state.cpp
similarity index 100%
rename from state.cpp
rename to src/state.cpp
diff --git a/state.h b/src/state.h
similarity index 100%
rename from state.h
rename to src/state.h
diff --git a/value.cpp b/src/value.cpp
similarity index 100%
rename from value.cpp
rename to src/value.cpp
diff --git a/value.h b/src/value.h
similarity index 100%
rename from value.h
rename to src/value.h
diff --git a/tests/test_basic.cpp b/tests/test_basic.cpp
index 5d74ed7..d9e5918 100644
--- a/tests/test_basic.cpp
+++ b/tests/test_basic.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/benchmark/catch_benchmark.hpp>
-#include "library.h"
+#include "camellya.h"
 
 #include <memory>