diff --git a/.gitignore b/.gitignore
index b8278f2..d9142d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-include/cubeai/base/cubeai_version.h
-include/cubeai/base/cubeai_config.h
+include/cuberl/base/cubeai_version.h
+include/cuberl/base/cubeai_config.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd96837..e75b232 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,18 +38,6 @@ ENDIF(COMMAND cmake_policy)
 
 OPTION(ENABLE_WEBOTS_FLAG OFF)
 
-# configure the project accordingly
-# Set the build type options supported
-# Debug and Release are the types supported
-SET(CMAKE_BUILD_TYPE "Debug")
-#SET(CMAKE_CXX_COMPILER g++-11)
-SET(CMAKE_CXX_STANDARD 20)
-#SET(CMAKE_CXX_STANDARD_REQUIRED True)
-#SET(CMAKE_C_COMPILER gcc-11)
-#SET(CMAKE_C_STANDARD 20)
-#SET(CMAKE_C_STANDARD_REQUIRED True)
-SET(CMAKE_LINKER_FLAGS "-pthread")
-
 SET(USE_OPENMP ON)
 SET(USE_LOG ON)
 SET(USE_PYTORCH ON)
@@ -62,7 +50,21 @@ SET(USE_RL ON)
 SET(DATA_SET_FOLDER ${PROJECT_SOURCE_DIR}/data)
 SET(ENABLE_EXAMPLES_FLAG ON)
 SET(ENABLE_TESTS_FLAG OFF) # Testing
-SET(ENABLE_DOC_FLAG OFF) # Documentation
+
+
+# configure the project accordingly
+# Set the build type options supported
+# Debug and Release are the types supported
+SET(CMAKE_BUILD_TYPE "Release")
+#SET(CMAKE_CXX_COMPILER g++-11)
+SET(CMAKE_CXX_STANDARD 20)
+#SET(CMAKE_CXX_STANDARD_REQUIRED True)
+#SET(CMAKE_C_COMPILER gcc-11)
+#SET(CMAKE_C_STANDARD 20)
+#SET(CMAKE_C_STANDARD_REQUIRED True)
+SET(CMAKE_LINKER_FLAGS "-pthread")
+
+
 
 # if we enable Webots then specify the paths
 # Note that if rlenvscpp is compiled with
@@ -174,8 +176,8 @@ MESSAGE(STATUS "C Compiler: ${CMAKE_C_COMPILER}")
 MESSAGE(STATUS "Project SRC directory: ${PROJECT_SOURCE_DIR}")
 
 # write configuration and version files
-configure_file(config.h.in ${PROJECT_SOURCE_DIR}/include/cubeai/base/cubeai_config.h @ONLY)
-configure_file(version.h.in ${PROJECT_SOURCE_DIR}/include/cubeai/base/cubeai_version.h @ONLY)
+configure_file(config.h.in ${PROJECT_SOURCE_DIR}/include/cuberl/base/cubeai_config.h @ONLY)
+configure_file(version.h.in ${PROJECT_SOURCE_DIR}/include/cuberl/base/cubeai_version.h @ONLY)
 
 # include directories
 INCLUDE_DIRECTORIES(${BOOST_INCLUDEDIR})
@@ -189,23 +191,23 @@ ENDIF()
 INCLUDE_DIRECTORIES(include/)
 
 # collect the source files for the library
-FILE(GLOB SRCS src/cubeai/base/*.cpp
-               src/cubeai/rl/*.cpp
-               src/cubeai/rl/*/*.cpp
-			   src/cubeai/rl/algorithms/*.cpp
-			   src/cubeai/rl/algorithms/*/*.cpp
-               src/cubeai/utils/*.cpp
-               src/cubeai/maths/*.cpp
-               src/cubeai/maths/statistics/*.cpp
-               src/cubeai/maths/statistics/distributions/*.cpp
-               src/cubeai/maths/optimization/*.cpp
-		       src/cubeai/control/*.cpp
+FILE(GLOB SRCS src/cuberl/base/*.cpp
+		src/cuberl/rl/*.cpp
+		src/cuberl/rl/*/*.cpp
+		src/cuberl/rl/algorithms/*.cpp
+		src/cuberl/rl/algorithms/*/*.cpp
+		src/cuberl/utils/*.cpp
+		src/cuberl/maths/*.cpp
+		src/cuberl/maths/statistics/*.cpp
+		src/cuberl/maths/statistics/distributions/*.cpp
+		src/cuberl/maths/optimization/*.cpp
+		src/cuberl/control/*.cpp
                #src/cubeai/planning/*.cpp
 	)
 
-ADD_LIBRARY(cubeailib SHARED ${SRCS})
-SET_TARGET_PROPERTIES(cubeailib PROPERTIES LINKER_LANGUAGE CXX)
-INSTALL(TARGETS cubeailib DESTINATION ${CMAKE_INSTALL_PREFIX})
+ADD_LIBRARY(cuberllib SHARED ${SRCS})
+SET_TARGET_PROPERTIES(cuberllib PROPERTIES LINKER_LANGUAGE CXX)
+INSTALL(TARGETS cuberllib DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 IF(ENABLE_EXAMPLES_FLAG)
 	# Add the examples
@@ -221,12 +223,7 @@ ELSE()
 	MESSAGE(WARNING "Tests have not been enabled")
 ENDIF()
 
-IF(ENABLE_DOC_FLAG)
-	# Add the documentation
-	ADD_SUBDIRECTORY(doc)
-ELSE()
-	MESSAGE(WARNING "Documentation will not be generated")
-ENDIF()
+
 
 MESSAGE(STATUS "Installation destination at: ${CMAKE_INSTALL_PREFIX}")
 MESSAGE(STATUS "Type make install to build cubeAI")
diff --git a/examples/filtering/filtering_example_1/CMakeLists.txt b/examples/filtering/filtering_example_1/CMakeLists.txt
index d5283b0..08d5c60 100644
--- a/examples/filtering/filtering_example_1/CMakeLists.txt
+++ b/examples/filtering/filtering_example_1/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/filtering/filtering_example_1/filtering_example_1.cpp b/examples/filtering/filtering_example_1/filtering_example_1.cpp
index 91a1463..42adba6 100755
--- a/examples/filtering/filtering_example_1/filtering_example_1.cpp
+++ b/examples/filtering/filtering_example_1/filtering_example_1.cpp
@@ -4,9 +4,9 @@
   * Greg Welch and Gary Bishop
   * */
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/estimation/kalman_filter.h"
-#include "cubeai/estimation/kf_model_base.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/estimation/kalman_filter.h"
+#include "cuberl/estimation/kf_model_base.h"
 #include "bitrl/utils/iteration_counter.h"
 #include "bitrl/utils/io/csv_file_writer.h"
 
diff --git a/examples/filtering/filtering_example_2/CMakeLists.txt b/examples/filtering/filtering_example_2/CMakeLists.txt
index 0f25d99..14cf630 100644
--- a/examples/filtering/filtering_example_2/CMakeLists.txt
+++ b/examples/filtering/filtering_example_2/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/filtering/filtering_example_2/filtering_example_2.cpp b/examples/filtering/filtering_example_2/filtering_example_2.cpp
index ac15230..91aaed6 100755
--- a/examples/filtering/filtering_example_2/filtering_example_2.cpp
+++ b/examples/filtering/filtering_example_2/filtering_example_2.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/estimation/extended_kalman_filter.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/estimation/extended_kalman_filter.h"
 #include "bitrl/utils/iteration_counter.h"
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/dynamics/diff_drive_dynamics.h"
diff --git a/examples/intro/intro_example_1/CMakeLists.txt b/examples/intro/intro_example_1/CMakeLists.txt
index b649817..19284b7 100644
--- a/examples/intro/intro_example_1/CMakeLists.txt
+++ b/examples/intro/intro_example_1/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/intro/intro_example_1/intro_example_1.cpp b/examples/intro/intro_example_1/intro_example_1.cpp
index 21b04f7..276803b 100755
--- a/examples/intro/intro_example_1/intro_example_1.cpp
+++ b/examples/intro/intro_example_1/intro_example_1.cpp
@@ -4,8 +4,8 @@
   *
   * */
 
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/utils/io/json_file_reader.h"
 #include "bitrl/utils/iteration_counter.h"
 #include "bitrl/utils/geometry/shapes/circle.h"
diff --git a/examples/intro/intro_example_2/CMakeLists.txt b/examples/intro/intro_example_2/CMakeLists.txt
index 196ba47..4918a57 100644
--- a/examples/intro/intro_example_2/CMakeLists.txt
+++ b/examples/intro/intro_example_2/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/intro/intro_example_2/intro_example_2.cpp b/examples/intro/intro_example_2/intro_example_2.cpp
index b2f19b6..60cf6c5 100755
--- a/examples/intro/intro_example_2/intro_example_2.cpp
+++ b/examples/intro/intro_example_2/intro_example_2.cpp
@@ -1,8 +1,8 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 #include <torch/torch.h>
 #include <boost/log/trivial.hpp>
diff --git a/examples/intro/intro_example_3/CMakeLists.txt b/examples/intro/intro_example_3/CMakeLists.txt
index c736fad..203213a 100644
--- a/examples/intro/intro_example_3/CMakeLists.txt
+++ b/examples/intro/intro_example_3/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/intro/intro_example_3/intro_example_3.cpp b/examples/intro/intro_example_3/intro_example_3.cpp
index 2c04186..2e3e306 100755
--- a/examples/intro/intro_example_3/intro_example_3.cpp
+++ b/examples/intro/intro_example_3/intro_example_3.cpp
@@ -1,8 +1,8 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/utils/iteration_counter.h"
 #include "bitrl/utils/io/json_file_reader.h"
 
@@ -13,7 +13,7 @@
 #include <filesystem>
 #include <string>
 
-namespace intro_example_2
+namespace example
 {
 
 using cuberl::real_t;
@@ -24,13 +24,10 @@ using bitrl::utils::IterationCounter;
 namespace fs = std::filesystem;
 const std::string CONFIG = "config.json";
 
-}
-
-int main() {
 
-    using namespace intro_example_2;
-
-    try{
+std::string train_model()
+{
+  try{
 
       // load the json configuration
       JSONFileReader json_reader(CONFIG);
@@ -59,7 +56,6 @@ int main() {
       BOOST_LOG_TRIVIAL(info)<<"Max epochs: "<<num_epochs;
       BOOST_LOG_TRIVIAL(info)<<"Learning rate: "<<learning_rate;
 
-
       // figure out the device we are using
       auto cuda_available = torch::cuda::is_available();
       torch::Device device(cuda_available ? torch::kCUDA : torch::kCPU);
@@ -70,8 +66,6 @@ int main() {
         BOOST_LOG_TRIVIAL(info)<<"CUDA is not available. Training on CPU "<<std::endl;
       }
 
-      torch::manual_seed(42);
-
       // Sample dataset
       auto x_train = torch::randint(0, 10, {15, 1},
                                     torch::TensorOptions(torch::kFloat).device(device));
@@ -87,14 +81,12 @@ int main() {
       torch::optim::SGD optimizer(model->parameters(),
                                   torch::optim::SGDOptions(learning_rate));
 
-      // Set floating point output precision
       BOOST_LOG_TRIVIAL(info)<<"Start training...";
 
-
       IterationCounter iteration_ctrl(num_epochs);
       while(iteration_ctrl.continue_iterations()){
 
-        // Forward pass
+          // Forward pass
           auto output = model->forward(x_train);
           auto loss = torch::nn::functional::mse_loss(output, y_train);
 
@@ -109,20 +101,72 @@ int main() {
           }
       }
 
-      BOOST_LOG_TRIVIAL(info)<<"Training is finished... ";
+      BOOST_LOG_TRIVIAL(info)<<"Training finished... ";
 
-      // let's also save the model
       auto model_filename = std::string(EXPERIMENT_DIR_PATH) + std::string("/linear_regression_model.pth");
-      torch::save(model, model_filename);
+      BOOST_LOG_TRIVIAL(info)<<"Saving model at: "<<model_filename<<std::endl;
 
+      torch::save(model, model_filename);
+      return model_filename;
     }
     catch(std::exception& e){
         std::cout<<e.what()<<std::endl;
     }
     catch(...){
-
-        std::cout<<"Unknown exception occured"<<std::endl;
+        std::cout<<"Unknown exception occurred"<<std::endl;
     }
+}
+
+void test_model(std::string& model_filename)
+{
+  BOOST_LOG_TRIVIAL(info)<<"Start testing...";
+  // load the json configuration
+  JSONFileReader json_reader(CONFIG);
+  json_reader.open();
+
+  const auto input_size = json_reader.template get_value<uint_t>("input_size");
+  const auto output_size = json_reader.template get_value<uint_t>("output_size");
+
+  // figure out the device we are using
+  auto cuda_available = torch::cuda::is_available();
+  torch::Device device(cuda_available ? torch::kCUDA : torch::kCPU);
+  if(cuda_available){
+    BOOST_LOG_TRIVIAL(info)<<"CUDA available. Testing on GPU ";
+  }
+  else{
+    BOOST_LOG_TRIVIAL(info)<<"CUDA is not available. Testing on CPU ";
+  }
+
+  torch::nn::Linear model(input_size, output_size);
+  torch::load(model, model_filename);
+  model->to(device);
+
+  // we will evaluate the model
+  model -> eval();
+
+  // Sample dataset
+  auto x_test = torch::randint(0, 10, {15, 1},
+                                torch::TensorOptions(torch::kFloat).device(device));
+  // get the test predictions
+  auto output = model->forward(x_test);
+
+  // do some comparisons
+  // ...
+
+  BOOST_LOG_TRIVIAL(info)<<"Testing finished... ";
+}
+
+}
+
+int main() {
+
+    using namespace example;
+
+    // set seed for torch
+    torch::manual_seed(42);
+    auto model_filename = train_model();
+
+    test_model(model_filename);
 
    return 0;
 }
diff --git a/examples/intro/intro_example_3/intro_example_3.md b/examples/intro/intro_example_3/intro_example_3.md
index 6e2630c..7a46b4d 100644
--- a/examples/intro/intro_example_3/intro_example_3.md
+++ b/examples/intro/intro_example_3/intro_example_3.md
@@ -23,41 +23,34 @@ The driver code for this tutorial is shown below.
 @code
 #include "cubeai/base/cubeai_config.h"
 
-#if defined(USE_PYTORCH) && defined(USE_RLENVS_CPP)
+#ifdef USE_PYTORCH
 
 #include "cubeai/base/cubeai_types.h"
-#include "cubeai/utils/iteration_counter.h"
-#include "cubeai/io/json_file_reader.h"
+#include "bitrl/utils/iteration_counter.h"
+#include "bitrl/utils/io/json_file_reader.h"
 
 #include <torch/torch.h>
 #include <boost/log/trivial.hpp>
 
-#include <iostream>
 #include <random>
 #include <filesystem>
 #include <string>
-#include <unordered_map>
-#include <any>
-#include <fstream>
 
-namespace intro_example_2
+namespace example
 {
 
-using cubeai::real_t;
-using cubeai::uint_t;
-using cubeai::io::JSONFileReader;
-using cubeai::utils::IterationCounter;
+using cuberl::real_t;
+using cuberl::uint_t;
+using bitrl::utils::io::JSONFileReader;
+using bitrl::utils::IterationCounter;
 
 namespace fs = std::filesystem;
 const std::string CONFIG = "config.json";
 
-}
-
-int main() {
-
-    using namespace intro_example_2;
 
-    try{
+std::string train_model()
+{
+try{
 
       // load the json configuration
       JSONFileReader json_reader(CONFIG);
@@ -86,7 +79,6 @@ int main() {
       BOOST_LOG_TRIVIAL(info)<<"Max epochs: "<<num_epochs;
       BOOST_LOG_TRIVIAL(info)<<"Learning rate: "<<learning_rate;
 
-
       // figure out the device we are using
       auto cuda_available = torch::cuda::is_available();
       torch::Device device(cuda_available ? torch::kCUDA : torch::kCPU);
@@ -97,7 +89,6 @@ int main() {
         BOOST_LOG_TRIVIAL(info)<<"CUDA is not available. Training on CPU "<<std::endl;
       }
 
-      torch::manual_seed(42);
       // Sample dataset
       auto x_train = torch::randint(0, 10, {15, 1},
                                     torch::TensorOptions(torch::kFloat).device(device));
@@ -113,14 +104,12 @@ int main() {
       torch::optim::SGD optimizer(model->parameters(),
                                   torch::optim::SGDOptions(learning_rate));
 
-      // Set floating point output precision
       BOOST_LOG_TRIVIAL(info)<<"Start training...";
 
-
       IterationCounter iteration_ctrl(num_epochs);
       while(iteration_ctrl.continue_iterations()){
 
-        // Forward pass
+          // Forward pass
           auto output = model->forward(x_train);
           auto loss = torch::nn::functional::mse_loss(output, y_train);
 
@@ -135,28 +124,80 @@ int main() {
           }
       }
 
-      BOOST_LOG_TRIVIAL(info)<<"Training is finished... ";
+      BOOST_LOG_TRIVIAL(info)<<"Training finished... ";
 
-      // let's also save the model
       auto model_filename = std::string(EXPERIMENT_DIR_PATH) + std::string("/linear_regression_model.pth");
-      torch::save(model, model_filename);
+      BOOST_LOG_TRIVIAL(info)<<"Saving model at: "<<model_filename<<std::endl;
 
+      torch::save(model, model_filename);
+      return model_filename;
     }
     catch(std::exception& e){
         std::cout<<e.what()<<std::endl;
     }
     catch(...){
-
-        std::cout<<"Unknown exception occured"<<std::endl;
+        std::cout<<"Unknown exception occurred"<<std::endl;
     }
+}
+
+void test_model(std::string& model_filename)
+{
+BOOST_LOG_TRIVIAL(info)<<"Start testing...";
+// load the json configuration
+JSONFileReader json_reader(CONFIG);
+json_reader.open();
+
+const auto input_size = json_reader.template get_value<uint_t>("input_size");
+const auto output_size = json_reader.template get_value<uint_t>("output_size");
+
+// figure out the device we are using
+auto cuda_available = torch::cuda::is_available();
+torch::Device device(cuda_available ? torch::kCUDA : torch::kCPU);
+if(cuda_available){
+BOOST_LOG_TRIVIAL(info)<<"CUDA available. Testing on GPU ";
+}
+else{
+BOOST_LOG_TRIVIAL(info)<<"CUDA is not available. Testing on CPU ";
+}
+
+torch::nn::Linear model(input_size, output_size);
+torch::load(model, model_filename);
+model->to(device);
+
+// we will evaluate the model
+model -> eval();
+
+// Sample dataset
+auto x_test = torch::randint(0, 10, {15, 1},
+torch::TensorOptions(torch::kFloat).device(device));
+// get the test predictions
+auto output = model->forward(x_test);
+
+// do some comparisons
+// ...
+
+BOOST_LOG_TRIVIAL(info)<<"Testing finished... ";
+}
 
-   return 0;
+}
+
+int main() {
+
+    using namespace example;
+
+    // set seed for torch
+    torch::manual_seed(42);
+    auto model_filename = train_model();
+
+    test_model(model_filename);
+
+return 0;
 }
 #else
 #include <iostream>
 int main(){
 
-    std::cout<<"This example requires PyTorch and gymfcpp. Reconfigure cuberl with USE_PYTORCH and USE_RLENVS_CPP flags turned ON."<<std::endl;
+    std::cout<<"This example requires PyTorch and gymfcpp. Reconfigure cuberl with USE_PYTORCH flags turned ON."<<std::endl;
     return 0;
 }
 #endif
@@ -165,28 +206,34 @@ int main(){
 Running the code above produces the following output
 
 ```
-[2024-05-27 10:15:48.581146] [0x00007f9aaa83d000] [info]    Experiment directory: intro_example_2_experiments/
-[2024-05-27 10:15:48.581173] [0x00007f9aaa83d000] [info]    Experiment id: 1
-
-[2024-05-27 10:15:48.581214] [0x00007f9aaa83d000] [info]    Input size: 1
-[2024-05-27 10:15:48.581217] [0x00007f9aaa83d000] [info]    Output size: 1
-[2024-05-27 10:15:48.581221] [0x00007f9aaa83d000] [info]    Max epochs: 60
-[2024-05-27 10:15:48.581238] [0x00007f9aaa83d000] [info]    Learning rate: 0.001
-[2024-05-27 10:15:49.777364] [0x00007f9aaa83d000] [info]    CUDA available. Training on GPU 
-
-[2024-05-27 10:15:49.841728] [0x00007f9aaa83d000] [info]    Start training...
-[2024-05-27 10:15:49.930313] [0x00007f9aaa83d000] [info]    Epoch [5/60], Loss: 7.19124
-[2024-05-27 10:15:49.931668] [0x00007f9aaa83d000] [info]    Epoch [10/60], Loss: 6.83168
-[2024-05-27 10:15:49.932512] [0x00007f9aaa83d000] [info]    Epoch [15/60], Loss: 6.65128
-[2024-05-27 10:15:49.933157] [0x00007f9aaa83d000] [info]    Epoch [20/60], Loss: 6.56069
-[2024-05-27 10:15:49.933783] [0x00007f9aaa83d000] [info]    Epoch [25/60], Loss: 6.51511
-[2024-05-27 10:15:49.934423] [0x00007f9aaa83d000] [info]    Epoch [30/60], Loss: 6.49209
-[2024-05-27 10:15:49.935069] [0x00007f9aaa83d000] [info]    Epoch [35/60], Loss: 6.48037
-[2024-05-27 10:15:49.935710] [0x00007f9aaa83d000] [info]    Epoch [40/60], Loss: 6.47432
-[2024-05-27 10:15:49.936349] [0x00007f9aaa83d000] [info]    Epoch [45/60], Loss: 6.47112
-[2024-05-27 10:15:49.937007] [0x00007f9aaa83d000] [info]    Epoch [50/60], Loss: 6.46934
-[2024-05-27 10:15:49.937671] [0x00007f9aaa83d000] [info]    Epoch [55/60], Loss: 6.46827
-[2024-05-27 10:15:49.938189] [0x00007f9aaa83d000] [info]    Epoch [60/60], Loss: 6.46756
-[2024-05-27 10:15:49.938197] [0x00007f9aaa83d000] [info]    Training is finished... 
+[2026-01-10 10:52:16.766804] [0x00007f3fc6bdc6c0] [info]    Experiment directory: intro_example_2_experiments/
+[2026-01-10 10:52:16.766822] [0x00007f3fc6bdc6c0] [info]    Experiment id: 1
+
+[2026-01-10 10:52:16.766851] [0x00007f3fc6bdc6c0] [info]    Input size: 1
+[2026-01-10 10:52:16.766855] [0x00007f3fc6bdc6c0] [info]    Output size: 1
+[2026-01-10 10:52:16.766858] [0x00007f3fc6bdc6c0] [info]    Max epochs: 60
+[2026-01-10 10:52:16.766873] [0x00007f3fc6bdc6c0] [info]    Learning rate: 0.001
+[2026-01-10 10:52:16.766880] [0x00007f3fc6bdc6c0] [info]    CUDA is not available. Training on CPU 
+
+[2026-01-10 10:52:16.785356] [0x00007f3fc6bdc6c0] [info]    Start training...
+[2026-01-10 10:52:16.809743] [0x00007f3fc6bdc6c0] [info]    Epoch [5/60], Loss: 23.7257
+[2026-01-10 10:52:16.810012] [0x00007f3fc6bdc6c0] [info]    Epoch [10/60], Loss: 23.3023
+[2026-01-10 10:52:16.810254] [0x00007f3fc6bdc6c0] [info]    Epoch [15/60], Loss: 22.9896
+[2026-01-10 10:52:16.810584] [0x00007f3fc6bdc6c0] [info]    Epoch [20/60], Loss: 22.751
+[2026-01-10 10:52:16.810948] [0x00007f3fc6bdc6c0] [info]    Epoch [25/60], Loss: 22.5618
+[2026-01-10 10:52:16.811305] [0x00007f3fc6bdc6c0] [info]    Epoch [30/60], Loss: 22.4059
+[2026-01-10 10:52:16.811655] [0x00007f3fc6bdc6c0] [info]    Epoch [35/60], Loss: 22.2722
+[2026-01-10 10:52:16.811899] [0x00007f3fc6bdc6c0] [info]    Epoch [40/60], Loss: 22.1536
+[2026-01-10 10:52:16.812296] [0x00007f3fc6bdc6c0] [info]    Epoch [45/60], Loss: 22.0452
+[2026-01-10 10:52:16.812528] [0x00007f3fc6bdc6c0] [info]    Epoch [50/60], Loss: 21.9438
+[2026-01-10 10:52:16.812779] [0x00007f3fc6bdc6c0] [info]    Epoch [55/60], Loss: 21.8473
+[2026-01-10 10:52:16.813002] [0x00007f3fc6bdc6c0] [info]    Epoch [60/60], Loss: 21.7542
+[2026-01-10 10:52:16.813055] [0x00007f3fc6bdc6c0] [info]    Training finished... 
+[2026-01-10 10:52:16.813060] [0x00007f3fc6bdc6c0] [info]    Saving model at: intro_example_2_experiments/1/linear_regression_model.pth
+
+[2026-01-10 10:52:16.815886] [0x00007f3fc6bdc6c0] [info]    Start testing...
+[2026-01-10 10:52:16.815932] [0x00007f3fc6bdc6c0] [info]    CUDA is not available. Testing on CPU 
+[2026-01-10 10:52:16.828503] [0x00007f3fc6bdc6c0] [info]    Testing finished... 
+
 ```
 
diff --git a/examples/intro/intro_example_4/CMakeLists.txt b/examples/intro/intro_example_4/CMakeLists.txt
index 1dc7919..fbe2130 100644
--- a/examples/intro/intro_example_4/CMakeLists.txt
+++ b/examples/intro/intro_example_4/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 IF(USE_MQTT)
     TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE paho-mqttpp3 paho-mqtt3as)
diff --git a/examples/intro/intro_example_4/intro_example_4.cpp b/examples/intro/intro_example_4/intro_example_4.cpp
index e82e16c..0a5d71a 100755
--- a/examples/intro/intro_example_4/intro_example_4.cpp
+++ b/examples/intro/intro_example_4/intro_example_4.cpp
@@ -1,8 +1,8 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/utils/iteration_counter.h"
 #include "bitrl/utils/io/json_file_reader.h"
 
diff --git a/examples/intro/intro_example_6/CMakeLists.txt b/examples/intro/intro_example_6/CMakeLists.txt
index 5c7f44b..f4a8d07 100644
--- a/examples/intro/intro_example_6/CMakeLists.txt
+++ b/examples/intro/intro_example_6/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/intro/intro_example_6/intro_example_6.cpp b/examples/intro/intro_example_6/intro_example_6.cpp
index ea0299c..9f98428 100755
--- a/examples/intro/intro_example_6/intro_example_6.cpp
+++ b/examples/intro/intro_example_6/intro_example_6.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 #include <cmath>
 #include <utility>
diff --git a/examples/intro/intro_example_7/CMakeLists.txt b/examples/intro/intro_example_7/CMakeLists.txt
index 85d197b..833d134 100644
--- a/examples/intro/intro_example_7/CMakeLists.txt
+++ b/examples/intro/intro_example_7/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/intro/intro_example_7/intro_example_7.cpp b/examples/intro/intro_example_7/intro_example_7.cpp
index 32daa70..1b0ef21 100755
--- a/examples/intro/intro_example_7/intro_example_7.cpp
+++ b/examples/intro/intro_example_7/intro_example_7.cpp
@@ -1,7 +1,7 @@
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/utils/iteration_counter.h"
 #include "bitrl/utils/maths/statistics/distributions/normal_dist.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/maths/vector_math.h"
 #include <boost/log/trivial.hpp>
 
 #include <cmath>
diff --git a/examples/rl/rl_example_1/CMakeLists.txt b/examples/rl/rl_example_1/CMakeLists.txt
index 096c9f1..e4e9056 100644
--- a/examples/rl/rl_example_1/CMakeLists.txt
+++ b/examples/rl/rl_example_1/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_1/rl_example_1.cpp b/examples/rl/rl_example_1/rl_example_1.cpp
index 8c8cac3..d8304f8 100755
--- a/examples/rl/rl_example_1/rl_example_1.cpp
+++ b/examples/rl/rl_example_1/rl_example_1.cpp
@@ -1,7 +1,7 @@
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/vector_math.h"
-#include "cubeai/rl/algorithms/utils.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/vector_math.h"
+#include "cuberl/rl/algorithms/utils.h"
 
 
 
diff --git a/examples/rl/rl_example_10/CMakeLists.txt b/examples/rl/rl_example_10/CMakeLists.txt
index cdf2328..e2520b1 100644
--- a/examples/rl/rl_example_10/CMakeLists.txt
+++ b/examples/rl/rl_example_10/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_10/rl_example_10.cpp b/examples/rl/rl_example_10/rl_example_10.cpp
index 0e9461f..4f56675 100755
--- a/examples/rl/rl_example_10/rl_example_10.cpp
+++ b/examples/rl/rl_example_10/rl_example_10.cpp
@@ -1,7 +1,7 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/td/q_learning.h"
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/td/q_learning.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/network/rest_rl_env_client.h"
diff --git a/examples/rl/rl_example_11/CMakeLists.txt b/examples/rl/rl_example_11/CMakeLists.txt
index dc40ef7..4c846c5 100644
--- a/examples/rl/rl_example_11/CMakeLists.txt
+++ b/examples/rl/rl_example_11/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_11/rl_example_11.cpp b/examples/rl/rl_example_11/rl_example_11.cpp
index a171224..1a3463b 100755
--- a/examples/rl/rl_example_11/rl_example_11.cpp
+++ b/examples/rl/rl_example_11/rl_example_11.cpp
@@ -1,14 +1,14 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/statistics/distributions/torch_categorical.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/rl/algorithms/pg/a2c.h"
-#include "cubeai/rl/algorithms/pg/a2c_config.h"
-#include "cubeai/maths/optimization/optimizer_type.h"
-#include "cubeai/maths/optimization/pytorch_optimizer_factory.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/statistics/distributions/torch_categorical.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/rl/algorithms/pg/a2c.h"
+#include "cuberl/rl/algorithms/pg/a2c_config.h"
+#include "cuberl/maths/optimization/optimizer_type.h"
+#include "cuberl/maths/optimization/pytorch_optimizer_factory.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/network/rest_rl_env_client.h"
diff --git a/examples/rl/rl_example_12/CMakeLists.txt b/examples/rl/rl_example_12/CMakeLists.txt
index ba34c4c..b5e91dd 100644
--- a/examples/rl/rl_example_12/CMakeLists.txt
+++ b/examples/rl/rl_example_12/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_12/rl_example_12.cpp b/examples/rl/rl_example_12/rl_example_12.cpp
index ebec2eb..2606a77 100755
--- a/examples/rl/rl_example_12/rl_example_12.cpp
+++ b/examples/rl/rl_example_12/rl_example_12.cpp
@@ -1,15 +1,15 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/maths/optimization/optimizer_type.h"
-#include "cubeai/maths/optimization/pytorch_optimizer_factory.h"
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
-#include "cubeai/utils/torch_adaptor.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/maths/optimization/optimizer_type.h"
+#include "cuberl/maths/optimization/pytorch_optimizer_factory.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/utils/torch_adaptor.h"
+#include "cuberl/maths/vector_math.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/envs/grid_world/grid_world_env.h"
diff --git a/examples/rl/rl_example_13/CMakeLists.txt b/examples/rl/rl_example_13/CMakeLists.txt
index 4fb7f74..063d130 100644
--- a/examples/rl/rl_example_13/CMakeLists.txt
+++ b/examples/rl/rl_example_13/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_13/rl_example_13.cpp b/examples/rl/rl_example_13/rl_example_13.cpp
index 570a6c0..604ea3b 100755
--- a/examples/rl/rl_example_13/rl_example_13.cpp
+++ b/examples/rl/rl_example_13/rl_example_13.cpp
@@ -2,17 +2,17 @@
  * This example illustrates how to use the REINFORCE algorithm
  * on the CartPole environment from Gymnasium
  **/
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/pg/reinforce.h"
-#include "cubeai/rl/algorithms/pg/reinforce_config.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/maths/optimization/optimizer_type.h"
-#include "cubeai/maths/optimization/pytorch_optimizer_factory.h"
-#include "cubeai/maths/statistics/distributions/torch_categorical.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/pg/reinforce.h"
+#include "cuberl/rl/algorithms/pg/reinforce_config.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/maths/optimization/optimizer_type.h"
+#include "cuberl/maths/optimization/pytorch_optimizer_factory.h"
+#include "cuberl/maths/statistics/distributions/torch_categorical.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/network/rest_rl_env_client.h"
diff --git a/examples/rl/rl_example_14/CMakeLists.txt b/examples/rl/rl_example_14/CMakeLists.txt
index 2f8ef7f..a45c0ed 100644
--- a/examples/rl/rl_example_14/CMakeLists.txt
+++ b/examples/rl/rl_example_14/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_14/rl_example_14.cpp b/examples/rl/rl_example_14/rl_example_14.cpp
index 1f1beda..de0a9b0 100755
--- a/examples/rl/rl_example_14/rl_example_14.cpp
+++ b/examples/rl/rl_example_14/rl_example_14.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #if defined(USE_PYTORCH) && defined(USE_GYMFCPP)
 
diff --git a/examples/rl/rl_example_15/CMakeLists.txt b/examples/rl/rl_example_15/CMakeLists.txt
index 62292d1..d75078b 100644
--- a/examples/rl/rl_example_15/CMakeLists.txt
+++ b/examples/rl/rl_example_15/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_15/rl_example_15.cpp b/examples/rl/rl_example_15/rl_example_15.cpp
index b72785c..fed1178 100755
--- a/examples/rl/rl_example_15/rl_example_15.cpp
+++ b/examples/rl/rl_example_15/rl_example_15.cpp
@@ -2,18 +2,18 @@
  * Use DQN on Gridworld
  *
  * */
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/maths/optimization/optimizer_type.h"
-#include "cubeai/maths/optimization/pytorch_optimizer_factory.h"
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
-#include "cubeai/utils/torch_adaptor.h"
-#include "cubeai/maths/vector_math.h"
-#include "cubeai/data_structs/experience_buffer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/maths/optimization/optimizer_type.h"
+#include "cuberl/maths/optimization/pytorch_optimizer_factory.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/utils/torch_adaptor.h"
+#include "cuberl/maths/vector_math.h"
+#include "cuberl/data_structs/experience_buffer.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/envs/grid_world/grid_world_env.h"
diff --git a/examples/rl/rl_example_19/CMakeLists.txt b/examples/rl/rl_example_19/CMakeLists.txt
index 8aac2ce..b55f7a2 100644
--- a/examples/rl/rl_example_19/CMakeLists.txt
+++ b/examples/rl/rl_example_19/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_19/rl_example_19.cpp b/examples/rl/rl_example_19/rl_example_19.cpp
index 96ae05d..e0631e0 100755
--- a/examples/rl/rl_example_19/rl_example_19.cpp
+++ b/examples/rl/rl_example_19/rl_example_19.cpp
@@ -1,9 +1,9 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/mc/first_visit_mc.h"
-#include "cubeai/rl/learning_rate_scheduler.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/mc/first_visit_mc.h"
+#include "cuberl/rl/learning_rate_scheduler.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/maths/vector_math.h"
 
 
 #include "bitrl/envs/gymnasium/toy_text/frozen_lake_env.h"
diff --git a/examples/rl/rl_example_2/CMakeLists.txt b/examples/rl/rl_example_2/CMakeLists.txt
index 35d8ba6..bb2d9d5 100644
--- a/examples/rl/rl_example_2/CMakeLists.txt
+++ b/examples/rl/rl_example_2/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 IF(USE_MQTT)
     TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE paho-mqttpp3 paho-mqtt3as)
diff --git a/examples/rl/rl_example_2/rl_example_2.cpp b/examples/rl/rl_example_2/rl_example_2.cpp
index 6b566b2..458ce7d 100755
--- a/examples/rl/rl_example_2/rl_example_2.cpp
+++ b/examples/rl/rl_example_2/rl_example_2.cpp
@@ -1,6 +1,6 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/vector_math.h"
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/vector_math.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
 #include "bitrl/utils/maths/statistics/distributions/beta_dist.h"
 #include "bitrl/utils/maths/statistics/distributions/bernoulli_dist.h"
 #include "bitrl/envs/multi_armed_bandits/multi_armed_bandits.h"
diff --git a/examples/rl/rl_example_20/CMakeLists.txt b/examples/rl/rl_example_20/CMakeLists.txt
index 9558bf3..170b23b 100644
--- a/examples/rl/rl_example_20/CMakeLists.txt
+++ b/examples/rl/rl_example_20/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_20/rl_example_20.cpp b/examples/rl/rl_example_20/rl_example_20.cpp
index 0a8c745..8b70879 100755
--- a/examples/rl/rl_example_20/rl_example_20.cpp
+++ b/examples/rl/rl_example_20/rl_example_20.cpp
@@ -2,16 +2,16 @@
  * This example illustrates how to use the REINFORCE algorithm
  * on the CartPole environment from Gymnasium
  **/
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/pg/reinforce.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/maths/optimization/optimizer_type.h"
-#include "cubeai/maths/optimization/pytorch_optimizer_factory.h"
-#include "cubeai/maths/statistics/distributions/torch_categorical.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/pg/reinforce.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/maths/optimization/optimizer_type.h"
+#include "cuberl/maths/optimization/pytorch_optimizer_factory.h"
+#include "cuberl/maths/statistics/distributions/torch_categorical.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/network/rest_rl_env_client.h"
diff --git a/examples/rl/rl_example_22/CMakeLists.txt b/examples/rl/rl_example_22/CMakeLists.txt
index eb4eb95..254a99e 100644
--- a/examples/rl/rl_example_22/CMakeLists.txt
+++ b/examples/rl/rl_example_22/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_22/rl_example_22.cpp b/examples/rl/rl_example_22/rl_example_22.cpp
index 2260e82..5065074 100755
--- a/examples/rl/rl_example_22/rl_example_22.cpp
+++ b/examples/rl/rl_example_22/rl_example_22.cpp
@@ -1,16 +1,16 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/rl/algorithms/pg/ppo.h"
-#include "cubeai/rl/algorithms/pg/ppo_config.h"
-#include "cubeai/maths/optimization/optimizer_type.h"
-#include "cubeai/maths/statistics/distributions/torch_normal.h"
-#include "cubeai/maths/optimization/pytorch_optimizer_factory.h"
-#include "cubeai/utils/torch_adaptor.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/rl/algorithms/pg/ppo.h"
+#include "cuberl/rl/algorithms/pg/ppo_config.h"
+#include "cuberl/maths/optimization/optimizer_type.h"
+#include "cuberl/maths/statistics/distributions/torch_normal.h"
+#include "cuberl/maths/optimization/pytorch_optimizer_factory.h"
+#include "cuberl/utils/torch_adaptor.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/network/rest_rl_env_client.h"
diff --git a/examples/rl/rl_example_3/CMakeLists.txt b/examples/rl/rl_example_3/CMakeLists.txt
index 62536b1..b002bd5 100644
--- a/examples/rl/rl_example_3/CMakeLists.txt
+++ b/examples/rl/rl_example_3/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_3/rl_example_3.cpp b/examples/rl/rl_example_3/rl_example_3.cpp
index 4cb5da7..94e3320 100755
--- a/examples/rl/rl_example_3/rl_example_3.cpp
+++ b/examples/rl/rl_example_3/rl_example_3.cpp
@@ -9,9 +9,9 @@
   *
   * */
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/vector_math.h"
-#include "cubeai/rl/policies/softmax_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/vector_math.h"
+#include "cuberl/rl/policies/softmax_policy.h"
 #include "bitrl/utils/io/csv_file_writer.h"
 #include <cmath>
 #include <utility>
diff --git a/examples/rl/rl_example_6/CMakeLists.txt b/examples/rl/rl_example_6/CMakeLists.txt
index 8876081..741ca3e 100644
--- a/examples/rl/rl_example_6/CMakeLists.txt
+++ b/examples/rl/rl_example_6/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_6/rl_example_6.cpp b/examples/rl/rl_example_6/rl_example_6.cpp
index 09b234c..903ba0e 100755
--- a/examples/rl/rl_example_6/rl_example_6.cpp
+++ b/examples/rl/rl_example_6/rl_example_6.cpp
@@ -1,7 +1,7 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/dp/iterative_policy_evaluation.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/rl/policies/uniform_discrete_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/dp/iterative_policy_evaluation.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/rl/policies/uniform_discrete_policy.h"
 
 #include "bitrl/envs/gymnasium/toy_text/frozen_lake_env.h"
 #include "bitrl/network/rest_rl_env_client.h"
diff --git a/examples/rl/rl_example_7/CMakeLists.txt b/examples/rl/rl_example_7/CMakeLists.txt
index d0c8ebd..12edfab 100644
--- a/examples/rl/rl_example_7/CMakeLists.txt
+++ b/examples/rl/rl_example_7/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 IF(USE_MQTT)
     TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE paho-mqttpp3 paho-mqtt3as)
diff --git a/examples/rl/rl_example_7/rl_example_7.cpp b/examples/rl/rl_example_7/rl_example_7.cpp
index e2307bf..503ca63 100755
--- a/examples/rl/rl_example_7/rl_example_7.cpp
+++ b/examples/rl/rl_example_7/rl_example_7.cpp
@@ -1,7 +1,7 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/dp/policy_iteration.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
-#include "cubeai/rl/policies/uniform_discrete_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/dp/policy_iteration.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/rl/policies/uniform_discrete_policy.h"
 #include "bitrl/network/rest_rl_env_client.h"
 #include "bitrl/envs/gymnasium/toy_text/frozen_lake_env.h"
 
diff --git a/examples/rl/rl_example_8/CMakeLists.txt b/examples/rl/rl_example_8/CMakeLists.txt
index 58c28ca..6fbf534 100644
--- a/examples/rl/rl_example_8/CMakeLists.txt
+++ b/examples/rl/rl_example_8/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_8/rl_example_8.cpp b/examples/rl/rl_example_8/rl_example_8.cpp
index 77e1687..524b6d0 100755
--- a/examples/rl/rl_example_8/rl_example_8.cpp
+++ b/examples/rl/rl_example_8/rl_example_8.cpp
@@ -1,6 +1,6 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/dp/value_iteration.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/dp/value_iteration.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/network/rest_rl_env_client.h"
diff --git a/examples/rl/rl_example_9/CMakeLists.txt b/examples/rl/rl_example_9/CMakeLists.txt
index 8ab7855..cf61dee 100644
--- a/examples/rl/rl_example_9/CMakeLists.txt
+++ b/examples/rl/rl_example_9/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(SOURCE ${EXECUTABLE}.cpp)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${SOURCE})
 
-TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cubeailib bitrllib pthread openblas tbb boost_log)
+TARGET_LINK_LIBRARIES(${EXECUTABLE} PRIVATE cuberllib bitrllib pthread openblas tbb boost_log)
 
 
 
diff --git a/examples/rl/rl_example_9/rl_example_9.cpp b/examples/rl/rl_example_9/rl_example_9.cpp
index cb7f48c..a8e005f 100755
--- a/examples/rl/rl_example_9/rl_example_9.cpp
+++ b/examples/rl/rl_example_9/rl_example_9.cpp
@@ -1,7 +1,7 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/td/sarsa.h"
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
-#include "cubeai/rl/trainers/rl_serial_agent_trainer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/td/sarsa.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/rl/trainers/rl_serial_agent_trainer.h"
 #include "bitrl/network/rest_rl_env_client.h"
 #include "bitrl/envs/gymnasium/toy_text/cliff_world_env.h"
 
diff --git a/include/cubeai/base/cubeai_types.h b/include/cuberl/base/cubeai_types.h
similarity index 97%
rename from include/cubeai/base/cubeai_types.h
rename to include/cuberl/base/cubeai_types.h
index d8e39a5..c1c4cb0 100755
--- a/include/cubeai/base/cubeai_types.h
+++ b/include/cuberl/base/cubeai_types.h
@@ -2,7 +2,7 @@
 #define CUBEAI_TYPES_H
 
 #include "bitrl/bitrl_types.h"
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 #include <torch/torch.h>
diff --git a/include/cubeai/base/torch_tensor_utils.h b/include/cuberl/base/torch_tensor_utils.h
similarity index 91%
rename from include/cubeai/base/torch_tensor_utils.h
rename to include/cuberl/base/torch_tensor_utils.h
index aa37bdf..9aae0de 100644
--- a/include/cubeai/base/torch_tensor_utils.h
+++ b/include/cuberl/base/torch_tensor_utils.h
@@ -1,12 +1,12 @@
 #ifndef TORCH_TENSOR_UTILS_H
 #define TORCH_TENSOR_UTILS_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/io/torch_state_dictionary_reader.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/io/torch_state_dictionary_reader.h"
 #include <torch/torch.h>
 
 
diff --git a/include/cubeai/control/lqr_controller.h b/include/cuberl/control/lqr_controller.h
similarity index 100%
rename from include/cubeai/control/lqr_controller.h
rename to include/cuberl/control/lqr_controller.h
diff --git a/include/cubeai/control/pid_controller.h b/include/cuberl/control/pid_controller.h
similarity index 98%
rename from include/cubeai/control/pid_controller.h
rename to include/cuberl/control/pid_controller.h
index 4b85b0a..3d132b0 100644
--- a/include/cubeai/control/pid_controller.h
+++ b/include/cuberl/control/pid_controller.h
@@ -4,7 +4,7 @@
 
 #ifndef PID_CONTROLLER_H
 #define PID_CONTROLLER_H
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 #include <utility>
 
diff --git a/include/cubeai/control/pure_pursuit_path_tracker.h b/include/cuberl/control/pure_pursuit_path_tracker.h
similarity index 100%
rename from include/cubeai/control/pure_pursuit_path_tracker.h
rename to include/cuberl/control/pure_pursuit_path_tracker.h
diff --git a/include/cubeai/data_structs/boost_graph_utils.h b/include/cuberl/data_structs/boost_graph_utils.h
similarity index 100%
rename from include/cubeai/data_structs/boost_graph_utils.h
rename to include/cuberl/data_structs/boost_graph_utils.h
diff --git a/include/cubeai/data_structs/boost_serial_graph.h b/include/cuberl/data_structs/boost_serial_graph.h
similarity index 100%
rename from include/cubeai/data_structs/boost_serial_graph.h
rename to include/cuberl/data_structs/boost_serial_graph.h
diff --git a/include/cubeai/data_structs/experience_buffer.h b/include/cuberl/data_structs/experience_buffer.h
similarity index 98%
rename from include/cubeai/data_structs/experience_buffer.h
rename to include/cuberl/data_structs/experience_buffer.h
index 3eeda30..a5bae46 100644
--- a/include/cubeai/data_structs/experience_buffer.h
+++ b/include/cuberl/data_structs/experience_buffer.h
@@ -1,8 +1,8 @@
 #ifndef EXPERIENCE_BUFFER_H
 #define EXPERIENCE_BUFFER_H
 
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
 
 #ifdef CUBERL_DEBUG
 #include <cassert>
diff --git a/include/cubeai/data_structs/fixed_size_priority_queue.h b/include/cuberl/data_structs/fixed_size_priority_queue.h
similarity index 100%
rename from include/cubeai/data_structs/fixed_size_priority_queue.h
rename to include/cuberl/data_structs/fixed_size_priority_queue.h
diff --git a/include/cubeai/data_structs/kd_tree.h b/include/cuberl/data_structs/kd_tree.h
similarity index 100%
rename from include/cubeai/data_structs/kd_tree.h
rename to include/cuberl/data_structs/kd_tree.h
diff --git a/include/cubeai/data_structs/serial_graph_builder.h b/include/cuberl/data_structs/serial_graph_builder.h
similarity index 100%
rename from include/cubeai/data_structs/serial_graph_builder.h
rename to include/cuberl/data_structs/serial_graph_builder.h
diff --git a/include/cubeai/estimation/extended_kalman_filter.h b/include/cuberl/estimation/extended_kalman_filter.h
similarity index 99%
rename from include/cubeai/estimation/extended_kalman_filter.h
rename to include/cuberl/estimation/extended_kalman_filter.h
index 682ee15..f22939b 100644
--- a/include/cubeai/estimation/extended_kalman_filter.h
+++ b/include/cuberl/estimation/extended_kalman_filter.h
@@ -1,7 +1,7 @@
 #ifndef EXTENDED_KALMAN_FILTER_H
 #define EXTENDED_KALMAN_FILTER_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "Eigen/Dense"
 #include <boost/noncopyable.hpp>
 #include <map>
diff --git a/include/cubeai/estimation/kalman_filter.h b/include/cuberl/estimation/kalman_filter.h
similarity index 99%
rename from include/cubeai/estimation/kalman_filter.h
rename to include/cuberl/estimation/kalman_filter.h
index 3ab2390..99deaeb 100644
--- a/include/cubeai/estimation/kalman_filter.h
+++ b/include/cuberl/estimation/kalman_filter.h
@@ -1,4 +1,4 @@
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/utils/std_map_utils.h"
 #include "Eigen/Dense"
 #include <boost/noncopyable.hpp>
diff --git a/include/cubeai/estimation/kf_model_base.h b/include/cuberl/estimation/kf_model_base.h
similarity index 100%
rename from include/cubeai/estimation/kf_model_base.h
rename to include/cuberl/estimation/kf_model_base.h
diff --git a/include/cubeai/extern/HTTPRequest.hpp b/include/cuberl/extern/HTTPRequest.hpp
similarity index 100%
rename from include/cubeai/extern/HTTPRequest.hpp
rename to include/cuberl/extern/HTTPRequest.hpp
diff --git a/include/cubeai/extern/enum.h b/include/cuberl/extern/enum.h
similarity index 100%
rename from include/cubeai/extern/enum.h
rename to include/cuberl/extern/enum.h
diff --git a/include/cubeai/extern/matplotlibcpp.h b/include/cuberl/extern/matplotlibcpp.h
similarity index 100%
rename from include/cubeai/extern/matplotlibcpp.h
rename to include/cuberl/extern/matplotlibcpp.h
diff --git a/include/cubeai/extern/nlohmann/json/json.hpp b/include/cuberl/extern/nlohmann/json/json.hpp
similarity index 100%
rename from include/cubeai/extern/nlohmann/json/json.hpp
rename to include/cuberl/extern/nlohmann/json/json.hpp
diff --git a/include/cubeai/extern/nlohmann/json/json_fwd.hpp b/include/cuberl/extern/nlohmann/json/json_fwd.hpp
similarity index 100%
rename from include/cubeai/extern/nlohmann/json/json_fwd.hpp
rename to include/cuberl/extern/nlohmann/json/json_fwd.hpp
diff --git a/include/cubeai/maths/lp_metric.h b/include/cuberl/maths/lp_metric.h
similarity index 100%
rename from include/cubeai/maths/lp_metric.h
rename to include/cuberl/maths/lp_metric.h
diff --git a/include/cubeai/maths/lp_metric_impl.h b/include/cuberl/maths/lp_metric_impl.h
similarity index 100%
rename from include/cubeai/maths/lp_metric_impl.h
rename to include/cuberl/maths/lp_metric_impl.h
diff --git a/include/cubeai/maths/matrix_utilities.h b/include/cuberl/maths/matrix_utilities.h
similarity index 99%
rename from include/cubeai/maths/matrix_utilities.h
rename to include/cuberl/maths/matrix_utilities.h
index 42b8f21..5c65402 100755
--- a/include/cubeai/maths/matrix_utilities.h
+++ b/include/cuberl/maths/matrix_utilities.h
@@ -1,7 +1,7 @@
 #ifndef MATRIX_UTILITIES_H
 #define MATRIX_UTILITIES_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 #include <random>
 #include <set>
diff --git a/include/cubeai/maths/optimization/optimizer_type.h b/include/cuberl/maths/optimization/optimizer_type.h
similarity index 94%
rename from include/cubeai/maths/optimization/optimizer_type.h
rename to include/cuberl/maths/optimization/optimizer_type.h
index 6f221a4..90d5c6e 100644
--- a/include/cubeai/maths/optimization/optimizer_type.h
+++ b/include/cuberl/maths/optimization/optimizer_type.h
@@ -1,7 +1,7 @@
 #ifndef OPTIMIZER_TYPE_H
 #define OPTIMIZER_TYPE_H
 
-#include "cubeai/extern/enum.h"
+#include "cuberl/extern/enum.h"
 #include <string>
 
 namespace cuberl {
diff --git a/include/cubeai/maths/optimization/pytorch_optimizer_factory.h b/include/cuberl/maths/optimization/pytorch_optimizer_factory.h
similarity index 92%
rename from include/cubeai/maths/optimization/pytorch_optimizer_factory.h
rename to include/cuberl/maths/optimization/pytorch_optimizer_factory.h
index af3a302..47d9076 100644
--- a/include/cubeai/maths/optimization/pytorch_optimizer_factory.h
+++ b/include/cuberl/maths/optimization/pytorch_optimizer_factory.h
@@ -1,12 +1,12 @@
 #ifndef PYTORCH_OPTIMIZER_FACTORY_H
 #define PYTORCH_OPTIMIZER_FACTORY_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
 
-#include "cubeai/maths/optimization/optimizer_type.h"
+#include "cuberl/maths/optimization/optimizer_type.h"
 #include <torch/torch.h>
 #include <memory>
 #include <map>
diff --git a/include/cubeai/maths/statistics/distributions/torch_bernoulli_dist.h b/include/cuberl/maths/statistics/distributions/torch_bernoulli_dist.h
similarity index 93%
rename from include/cubeai/maths/statistics/distributions/torch_bernoulli_dist.h
rename to include/cuberl/maths/statistics/distributions/torch_bernoulli_dist.h
index e4aa48a..000b994 100644
--- a/include/cubeai/maths/statistics/distributions/torch_bernoulli_dist.h
+++ b/include/cuberl/maths/statistics/distributions/torch_bernoulli_dist.h
@@ -6,12 +6,12 @@
 ///  https://github.com/Omegastick/pytorch-cpp-rl/tree/master
 ///
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/statistics/distributions/torch_distribution.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/statistics/distributions/torch_distribution.h"
 
 #include <torch/torch.h>
 
diff --git a/include/cubeai/maths/statistics/distributions/torch_categorical.h b/include/cuberl/maths/statistics/distributions/torch_categorical.h
similarity index 92%
rename from include/cubeai/maths/statistics/distributions/torch_categorical.h
rename to include/cuberl/maths/statistics/distributions/torch_categorical.h
index a0e5415..2e12714 100644
--- a/include/cubeai/maths/statistics/distributions/torch_categorical.h
+++ b/include/cuberl/maths/statistics/distributions/torch_categorical.h
@@ -5,12 +5,12 @@
  *
  */
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/statistics/distributions/torch_distribution.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/statistics/distributions/torch_distribution.h"
 
 #include <torch/torch.h>
 
diff --git a/include/cubeai/maths/statistics/distributions/torch_distribution.h b/include/cuberl/maths/statistics/distributions/torch_distribution.h
similarity index 94%
rename from include/cubeai/maths/statistics/distributions/torch_distribution.h
rename to include/cuberl/maths/statistics/distributions/torch_distribution.h
index f13834e..83e756e 100644
--- a/include/cubeai/maths/statistics/distributions/torch_distribution.h
+++ b/include/cuberl/maths/statistics/distributions/torch_distribution.h
@@ -1,11 +1,11 @@
 #ifndef TORCH_DISTRIBUTION_H
 #define TORCH_DISTRIBUTION_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "torch/torch.h"
 
 #include <vector>
diff --git a/include/cubeai/maths/statistics/distributions/torch_normal.h b/include/cuberl/maths/statistics/distributions/torch_normal.h
similarity index 92%
rename from include/cubeai/maths/statistics/distributions/torch_normal.h
rename to include/cuberl/maths/statistics/distributions/torch_normal.h
index 969d8cf..b33c71c 100644
--- a/include/cubeai/maths/statistics/distributions/torch_normal.h
+++ b/include/cuberl/maths/statistics/distributions/torch_normal.h
@@ -5,12 +5,12 @@
 #ifndef TORCH_NORMAL_H
 #define TORCH_NORMAL_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/statistics/distributions/torch_distribution.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/statistics/distributions/torch_distribution.h"
 
 #include <torch/torch.h>
 
diff --git a/include/cubeai/maths/vector_math.h b/include/cuberl/maths/vector_math.h
similarity index 99%
rename from include/cubeai/maths/vector_math.h
rename to include/cuberl/maths/vector_math.h
index dc1bea5..e22f9da 100644
--- a/include/cubeai/maths/vector_math.h
+++ b/include/cuberl/maths/vector_math.h
@@ -4,9 +4,9 @@
   * Implements basic statistical computations on arrays
   */
 
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/utils/cubeai_concepts.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/utils/cubeai_concepts.h"
 #include "bitrl/bitrl_consts.h"
 
 #include <cmath>
diff --git a/include/cubeai/planning/a_star_search.h b/include/cuberl/planning/a_star_search.h
similarity index 100%
rename from include/cubeai/planning/a_star_search.h
rename to include/cuberl/planning/a_star_search.h
diff --git a/include/cubeai/planning/diff_drive_dynamic_window.h b/include/cuberl/planning/diff_drive_dynamic_window.h
similarity index 100%
rename from include/cubeai/planning/diff_drive_dynamic_window.h
rename to include/cuberl/planning/diff_drive_dynamic_window.h
diff --git a/include/cubeai/planning/rapidly_exploring_random_tree.h b/include/cuberl/planning/rapidly_exploring_random_tree.h
similarity index 100%
rename from include/cubeai/planning/rapidly_exploring_random_tree.h
rename to include/cuberl/planning/rapidly_exploring_random_tree.h
diff --git a/include/cubeai/rl/agents/dummy_agent.h b/include/cuberl/rl/agents/dummy_agent.h
similarity index 100%
rename from include/cubeai/rl/agents/dummy_agent.h
rename to include/cuberl/rl/agents/dummy_agent.h
diff --git a/include/cubeai/rl/algorithms/dp/dp_algo_base.h b/include/cuberl/rl/algorithms/dp/dp_algo_base.h
similarity index 90%
rename from include/cubeai/rl/algorithms/dp/dp_algo_base.h
rename to include/cuberl/rl/algorithms/dp/dp_algo_base.h
index 3bb39da..cf21da4 100644
--- a/include/cubeai/rl/algorithms/dp/dp_algo_base.h
+++ b/include/cuberl/rl/algorithms/dp/dp_algo_base.h
@@ -1,8 +1,8 @@
 #ifndef DP_ALGO_BASE_H
 #define DP_ALGO_BASE_H
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/rl_algorithm_base.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/rl_algorithm_base.h"
 
 #include <tuple>
 #include <vector>
diff --git a/include/cubeai/rl/algorithms/dp/iterative_policy_evaluation.h b/include/cuberl/rl/algorithms/dp/iterative_policy_evaluation.h
similarity index 98%
rename from include/cubeai/rl/algorithms/dp/iterative_policy_evaluation.h
rename to include/cuberl/rl/algorithms/dp/iterative_policy_evaluation.h
index 0b257ee..8c41f75 100644
--- a/include/cubeai/rl/algorithms/dp/iterative_policy_evaluation.h
+++ b/include/cuberl/rl/algorithms/dp/iterative_policy_evaluation.h
@@ -1,8 +1,8 @@
 #ifndef ITERATIVE_POLICY_EVALUATION_H
 #define ITERATIVE_POLICY_EVALUATION_H
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/dp/dp_algo_base.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/dp/dp_algo_base.h"
 
 #include "bitrl/utils/iteration_counter.h"
 #include "bitrl/utils/io/csv_file_writer.h"
diff --git a/include/cubeai/rl/algorithms/dp/policy_improvement.h b/include/cuberl/rl/algorithms/dp/policy_improvement.h
similarity index 96%
rename from include/cubeai/rl/algorithms/dp/policy_improvement.h
rename to include/cuberl/rl/algorithms/dp/policy_improvement.h
index 7558575..f02e772 100644
--- a/include/cubeai/rl/algorithms/dp/policy_improvement.h
+++ b/include/cuberl/rl/algorithms/dp/policy_improvement.h
@@ -1,9 +1,9 @@
 #ifndef POLICY_IMPROVEMENT_H
 #define POLICY_IMPROVEMENT_H
 
-#include "cubeai/rl/algorithms/dp/dp_algo_base.h"
-#include "cubeai/rl/algorithms/utils.h"
-#include "cubeai/rl/policies/adaptors/policy_stochastic_adaptor.h"
+#include "cuberl/rl/algorithms/dp/dp_algo_base.h"
+#include "cuberl/rl/algorithms/utils.h"
+#include "cuberl/rl/policies/adaptors/policy_stochastic_adaptor.h"
 
 #include <any>
 #include <map>
diff --git a/include/cubeai/rl/algorithms/dp/policy_iteration.h b/include/cuberl/rl/algorithms/dp/policy_iteration.h
similarity index 96%
rename from include/cubeai/rl/algorithms/dp/policy_iteration.h
rename to include/cuberl/rl/algorithms/dp/policy_iteration.h
index 74ec795..cbcf52c 100644
--- a/include/cubeai/rl/algorithms/dp/policy_iteration.h
+++ b/include/cuberl/rl/algorithms/dp/policy_iteration.h
@@ -1,10 +1,10 @@
 #ifndef POLICY_ITERATION_H
 #define POLICY_ITERATION_H
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/dp/dp_algo_base.h"
-#include "cubeai/rl/algorithms/dp/iterative_policy_evaluation.h"
-#include "cubeai/rl/algorithms/dp/policy_improvement.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/dp/dp_algo_base.h"
+#include "cuberl/rl/algorithms/dp/iterative_policy_evaluation.h"
+#include "cuberl/rl/algorithms/dp/policy_improvement.h"
 
 #include "bitrl//utils/io/csv_file_writer.h"
 #include "bitrl/bitrl_consts.h"
diff --git a/include/cubeai/rl/algorithms/dp/value_iteration.h b/include/cuberl/rl/algorithms/dp/value_iteration.h
similarity index 92%
rename from include/cubeai/rl/algorithms/dp/value_iteration.h
rename to include/cuberl/rl/algorithms/dp/value_iteration.h
index 3c263d6..0cb7187 100644
--- a/include/cubeai/rl/algorithms/dp/value_iteration.h
+++ b/include/cuberl/rl/algorithms/dp/value_iteration.h
@@ -1,14 +1,14 @@
 #ifndef VALUE_ITERATION_H
 #define VALUE_ITERATION_H
 
-#include "cubeai/base/cubeai_config.h" //KERNEL_PRINT_DBG_MSGS
-#include "cubeai/base/cubeai_types.h"
-
-#include "cubeai/rl/algorithms/dp/dp_algo_base.h"
-#include "cubeai/rl/algorithms/dp/policy_improvement.h"
-#include "cubeai/rl/algorithms/utils.h"
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/rl/policies/max_tabular_policy.h"
+#include "cuberl/base/cubeai_config.h" //KERNEL_PRINT_DBG_MSGS
+#include "cuberl/base/cubeai_types.h"
+
+#include "cuberl/rl/algorithms/dp/dp_algo_base.h"
+#include "cuberl/rl/algorithms/dp/policy_improvement.h"
+#include "cuberl/rl/algorithms/utils.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/rl/policies/max_tabular_policy.h"
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/bitrl_consts.h"
 
diff --git a/include/cubeai/rl/algorithms/mc/first_visit_mc.h b/include/cuberl/rl/algorithms/mc/first_visit_mc.h
similarity index 98%
rename from include/cubeai/rl/algorithms/mc/first_visit_mc.h
rename to include/cuberl/rl/algorithms/mc/first_visit_mc.h
index 7438d2a..1c7277f 100644
--- a/include/cubeai/rl/algorithms/mc/first_visit_mc.h
+++ b/include/cuberl/rl/algorithms/mc/first_visit_mc.h
@@ -4,11 +4,11 @@
 #ifndef FIRST_VISIT_MC_H
 #define FIRST_VISIT_MC_H
 
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
 
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/maths/vector_math.h"
 #include "bitrl/bitrl_consts.h"
 
 #ifdef CUBEAI_PRINT_DBG_MSGS
diff --git a/include/cubeai/rl/algorithms/mc/mc_tree_search_solver.h b/include/cuberl/rl/algorithms/mc/mc_tree_search_solver.h
similarity index 100%
rename from include/cubeai/rl/algorithms/mc/mc_tree_search_solver.h
rename to include/cuberl/rl/algorithms/mc/mc_tree_search_solver.h
diff --git a/include/cubeai/rl/algorithms/mc/mcts_node.h b/include/cuberl/rl/algorithms/mc/mcts_node.h
similarity index 100%
rename from include/cubeai/rl/algorithms/mc/mcts_node.h
rename to include/cuberl/rl/algorithms/mc/mcts_node.h
diff --git a/include/cubeai/rl/algorithms/pg/a2c.h b/include/cuberl/rl/algorithms/pg/a2c.h
similarity index 96%
rename from include/cubeai/rl/algorithms/pg/a2c.h
rename to include/cuberl/rl/algorithms/pg/a2c.h
index 57227cc..4a5fa0f 100644
--- a/include/cubeai/rl/algorithms/pg/a2c.h
+++ b/include/cuberl/rl/algorithms/pg/a2c.h
@@ -8,18 +8,18 @@
 /// 
 /// 
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/utils/torch_adaptor.h"
-#include "cubeai/rl/algorithms/rl_algorithm_base.h"
-#include "cubeai/rl/algorithms/utils.h"
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/rl/algorithms/pg/a2c_config.h"
-#include "cubeai/rl/algorithms/pg/a2c_monitor.h"
-#include "cubeai/data_structs/experience_buffer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/utils/torch_adaptor.h"
+#include "cuberl/rl/algorithms/rl_algorithm_base.h"
+#include "cuberl/rl/algorithms/utils.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/rl/algorithms/pg/a2c_config.h"
+#include "cuberl/rl/algorithms/pg/a2c_monitor.h"
+#include "cuberl/data_structs/experience_buffer.h"
 
 
 #include <torch/torch.h>
diff --git a/include/cubeai/rl/algorithms/pg/a2c_config.h b/include/cuberl/rl/algorithms/pg/a2c_config.h
similarity index 96%
rename from include/cubeai/rl/algorithms/pg/a2c_config.h
rename to include/cuberl/rl/algorithms/pg/a2c_config.h
index e8e767c..78ee6cf 100644
--- a/include/cubeai/rl/algorithms/pg/a2c_config.h
+++ b/include/cuberl/rl/algorithms/pg/a2c_config.h
@@ -1,9 +1,9 @@
 #ifndef A2C_CONFIG_H
 #define A2C_CONFIG_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 //#include "bitrl/rlenvs_consts.h"
-#include "cubeai/utils/train_enum_type.h"
+#include "cuberl/utils/train_enum_type.h"
 
 #include <ostream>
 #include <string>
diff --git a/include/cubeai/rl/algorithms/pg/a2c_monitor.h b/include/cuberl/rl/algorithms/pg/a2c_monitor.h
similarity index 92%
rename from include/cubeai/rl/algorithms/pg/a2c_monitor.h
rename to include/cuberl/rl/algorithms/pg/a2c_monitor.h
index ee8ddd4..861c9b3 100644
--- a/include/cubeai/rl/algorithms/pg/a2c_monitor.h
+++ b/include/cuberl/rl/algorithms/pg/a2c_monitor.h
@@ -1,12 +1,12 @@
 #ifndef A2C_MONITOR_H
 #define A2C_MONITOR_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/data_structs/experience_buffer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/data_structs/experience_buffer.h"
 
 
 #include <vector>
diff --git a/include/cubeai/rl/algorithms/pg/actor_critic_solver_base.h b/include/cuberl/rl/algorithms/pg/actor_critic_solver_base.h
similarity index 95%
rename from include/cubeai/rl/algorithms/pg/actor_critic_solver_base.h
rename to include/cuberl/rl/algorithms/pg/actor_critic_solver_base.h
index 96f4ee7..28cf83a 100644
--- a/include/cubeai/rl/algorithms/pg/actor_critic_solver_base.h
+++ b/include/cuberl/rl/algorithms/pg/actor_critic_solver_base.h
@@ -8,18 +8,18 @@
 /// 
 /// 
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/utils/torch_adaptor.h"
-#include "cubeai/rl/algorithms/rl_algorithm_base.h"
-#include "cubeai/rl/algorithms/utils.h"
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/rl/algorithms/pg/a2c_config.h"
-#include "cubeai/rl/algorithms/pg/a2c_monitor.h"
-#include "cubeai/data_structs/experience_buffer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/utils/torch_adaptor.h"
+#include "cuberl/rl/algorithms/rl_algorithm_base.h"
+#include "cuberl/rl/algorithms/utils.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/rl/algorithms/pg/a2c_config.h"
+#include "cuberl/rl/algorithms/pg/a2c_monitor.h"
+#include "cuberl/data_structs/experience_buffer.h"
 
 
 #include <torch/torch.h>
diff --git a/include/cubeai/rl/algorithms/pg/ppo.h b/include/cuberl/rl/algorithms/pg/ppo.h
similarity index 95%
rename from include/cubeai/rl/algorithms/pg/ppo.h
rename to include/cuberl/rl/algorithms/pg/ppo.h
index ea5bfe0..7f065f6 100644
--- a/include/cubeai/rl/algorithms/pg/ppo.h
+++ b/include/cuberl/rl/algorithms/pg/ppo.h
@@ -8,17 +8,17 @@
 /// 
 /// 
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/utils/torch_adaptor.h"
-#include "cubeai/rl/algorithms/pg/actor_critic_solver_base.h"
-#include "cubeai/rl/algorithms/utils.h"
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/rl/algorithms/pg/ppo_config.h"
-#include "cubeai/rl/algorithms/pg/a2c_monitor.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/utils/torch_adaptor.h"
+#include "cuberl/rl/algorithms/pg/actor_critic_solver_base.h"
+#include "cuberl/rl/algorithms/utils.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/rl/algorithms/pg/ppo_config.h"
+#include "cuberl/rl/algorithms/pg/a2c_monitor.h"
 
 #include <torch/torch.h>
 
diff --git a/include/cubeai/rl/algorithms/pg/ppo_config.h b/include/cuberl/rl/algorithms/pg/ppo_config.h
similarity index 95%
rename from include/cubeai/rl/algorithms/pg/ppo_config.h
rename to include/cuberl/rl/algorithms/pg/ppo_config.h
index 9249416..6f616dd 100644
--- a/include/cubeai/rl/algorithms/pg/ppo_config.h
+++ b/include/cuberl/rl/algorithms/pg/ppo_config.h
@@ -2,9 +2,9 @@
 #define PPO_CONFIG_H
 
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 //#include "rlenvs/rlenvs_consts.h"
-#include "cubeai/utils/train_enum_type.h"
+#include "cuberl/utils/train_enum_type.h"
 
 #include <ostream>
 #include <string>
diff --git a/include/cubeai/rl/algorithms/pg/reinforce.h b/include/cuberl/rl/algorithms/pg/reinforce.h
similarity index 96%
rename from include/cubeai/rl/algorithms/pg/reinforce.h
rename to include/cuberl/rl/algorithms/pg/reinforce.h
index 86fad6f..8c013a5 100644
--- a/include/cubeai/rl/algorithms/pg/reinforce.h
+++ b/include/cuberl/rl/algorithms/pg/reinforce.h
@@ -7,20 +7,20 @@
 /// Implements the REINFORCE algorithm
 ///
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/rl_algorithm_base.h"
-#include "cubeai/rl/algorithms/utils.h"
-#include "cubeai/rl/algorithms/pg/reinforce_config.h"
-#include "cubeai/rl/algorithms/pg/reinforce_monitor.h"
-#include "cubeai/rl/algorithms/pg/reinforce_loss.h"
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/maths/vector_math.h"
-#include "cubeai/data_structs/experience_buffer.h"
-#include "cubeai/utils/torch_adaptor.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/rl_algorithm_base.h"
+#include "cuberl/rl/algorithms/utils.h"
+#include "cuberl/rl/algorithms/pg/reinforce_config.h"
+#include "cuberl/rl/algorithms/pg/reinforce_monitor.h"
+#include "cuberl/rl/algorithms/pg/reinforce_loss.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/maths/vector_math.h"
+#include "cuberl/data_structs/experience_buffer.h"
+#include "cuberl/utils/torch_adaptor.h"
 
 #include <boost/log/trivial.hpp>
 #include <torch/torch.h>
diff --git a/include/cubeai/rl/algorithms/pg/reinforce_config.h b/include/cuberl/rl/algorithms/pg/reinforce_config.h
similarity index 95%
rename from include/cubeai/rl/algorithms/pg/reinforce_config.h
rename to include/cuberl/rl/algorithms/pg/reinforce_config.h
index 8463f5f..ef29de7 100644
--- a/include/cubeai/rl/algorithms/pg/reinforce_config.h
+++ b/include/cuberl/rl/algorithms/pg/reinforce_config.h
@@ -1,9 +1,9 @@
 #ifndef REINFORCE_CONFIG_H
 #define REINFORCE_CONFIG_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/bitrl_consts.h"
-#include "cubeai/utils/train_enum_type.h"
+#include "cuberl/utils/train_enum_type.h"
 
 #include <ostream>
 #include <string>
diff --git a/include/cubeai/rl/algorithms/pg/reinforce_loss.h b/include/cuberl/rl/algorithms/pg/reinforce_loss.h
similarity index 93%
rename from include/cubeai/rl/algorithms/pg/reinforce_loss.h
rename to include/cuberl/rl/algorithms/pg/reinforce_loss.h
index 6de41f2..4618e6b 100644
--- a/include/cubeai/rl/algorithms/pg/reinforce_loss.h
+++ b/include/cuberl/rl/algorithms/pg/reinforce_loss.h
@@ -1,11 +1,11 @@
 #ifndef REINFORCE_LOSS_H
 #define REINFORCE_LOSS_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/bitrl_consts.h"
 
 #include <vector>
diff --git a/include/cubeai/rl/algorithms/pg/reinforce_monitor.h b/include/cuberl/rl/algorithms/pg/reinforce_monitor.h
similarity index 92%
rename from include/cubeai/rl/algorithms/pg/reinforce_monitor.h
rename to include/cuberl/rl/algorithms/pg/reinforce_monitor.h
index 2e5ece6..a94ea07 100644
--- a/include/cubeai/rl/algorithms/pg/reinforce_monitor.h
+++ b/include/cuberl/rl/algorithms/pg/reinforce_monitor.h
@@ -1,12 +1,12 @@
 #ifndef REINFORCE_MONITOR_H
 #define REINFORCE_MONITOR_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/data_structs/experience_buffer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/data_structs/experience_buffer.h"
 
 
 #include <vector>
diff --git a/include/cubeai/rl/algorithms/rl_algo_config.h b/include/cuberl/rl/algorithms/rl_algo_config.h
similarity index 91%
rename from include/cubeai/rl/algorithms/rl_algo_config.h
rename to include/cuberl/rl/algorithms/rl_algo_config.h
index b5a5d6b..cf8ef31 100644
--- a/include/cubeai/rl/algorithms/rl_algo_config.h
+++ b/include/cuberl/rl/algorithms/rl_algo_config.h
@@ -1,7 +1,7 @@
 #ifndef RL_ALGO_INPUT_H
 #define RL_ALGO_INPUT_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 namespace cuberl{
 namespace rl{
diff --git a/include/cubeai/rl/algorithms/rl_algorithm_base.h b/include/cuberl/rl/algorithms/rl_algorithm_base.h
similarity index 95%
rename from include/cubeai/rl/algorithms/rl_algorithm_base.h
rename to include/cuberl/rl/algorithms/rl_algorithm_base.h
index ab1fadd..b262c92 100644
--- a/include/cubeai/rl/algorithms/rl_algorithm_base.h
+++ b/include/cuberl/rl/algorithms/rl_algorithm_base.h
@@ -1,8 +1,8 @@
 #ifndef RL_ALGORITHM_BASE_H
 #define RL_ALGORITHM_BASE_H
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/episode_info.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/episode_info.h"
 
 
 #include <boost/noncopyable.hpp>
diff --git a/include/cubeai/rl/algorithms/td/double_q_learning.h b/include/cuberl/rl/algorithms/td/double_q_learning.h
similarity index 100%
rename from include/cubeai/rl/algorithms/td/double_q_learning.h
rename to include/cuberl/rl/algorithms/td/double_q_learning.h
diff --git a/include/cubeai/rl/algorithms/td/expected_sarsa.h b/include/cuberl/rl/algorithms/td/expected_sarsa.h
similarity index 100%
rename from include/cubeai/rl/algorithms/td/expected_sarsa.h
rename to include/cuberl/rl/algorithms/td/expected_sarsa.h
diff --git a/include/cubeai/rl/algorithms/td/q_learning.h b/include/cuberl/rl/algorithms/td/q_learning.h
similarity index 96%
rename from include/cubeai/rl/algorithms/td/q_learning.h
rename to include/cuberl/rl/algorithms/td/q_learning.h
index 26ec7c2..2f5c63a 100755
--- a/include/cubeai/rl/algorithms/td/q_learning.h
+++ b/include/cuberl/rl/algorithms/td/q_learning.h
@@ -1,13 +1,13 @@
 #ifndef Q_LEARNING_H
 #define Q_LEARNING_H
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/rl/algorithms/td/td_algo_base.h"
-#include "cubeai/rl/worlds/envs_concepts.h"
-#include "cubeai/rl/policies/max_tabular_policy.h"
-#include "cubeai/maths/matrix_utilities.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/rl/algorithms/td/td_algo_base.h"
+#include "cuberl/rl/worlds/envs_concepts.h"
+#include "cuberl/rl/policies/max_tabular_policy.h"
+#include "cuberl/maths/matrix_utilities.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/bitrl_consts.h"
diff --git a/include/cubeai/rl/algorithms/td/sarsa.h b/include/cuberl/rl/algorithms/td/sarsa.h
similarity index 96%
rename from include/cubeai/rl/algorithms/td/sarsa.h
rename to include/cuberl/rl/algorithms/td/sarsa.h
index 9ec9c97..acc0418 100644
--- a/include/cubeai/rl/algorithms/td/sarsa.h
+++ b/include/cuberl/rl/algorithms/td/sarsa.h
@@ -1,12 +1,12 @@
 #ifndef SARSA_H
 #define SARSA_H
 
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/rl/algorithms/td/td_algo_base.h"
-#include "cubeai/rl/worlds/envs_concepts.h"
-#include "cubeai/rl/episode_info.h"
-#include "cubeai/rl/policies/max_tabular_policy.h"
-#include "cubeai/maths/matrix_utilities.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/rl/algorithms/td/td_algo_base.h"
+#include "cuberl/rl/worlds/envs_concepts.h"
+#include "cuberl/rl/episode_info.h"
+#include "cuberl/rl/policies/max_tabular_policy.h"
+#include "cuberl/maths/matrix_utilities.h"
 
 #include "bitrl/utils/io/csv_file_writer.h"
 #include "bitrl/bitrl_consts.h"
diff --git a/include/cubeai/rl/algorithms/td/td_algo_base.h b/include/cuberl/rl/algorithms/td/td_algo_base.h
similarity index 89%
rename from include/cubeai/rl/algorithms/td/td_algo_base.h
rename to include/cuberl/rl/algorithms/td/td_algo_base.h
index 6f01b5c..f7a4071 100644
--- a/include/cubeai/rl/algorithms/td/td_algo_base.h
+++ b/include/cuberl/rl/algorithms/td/td_algo_base.h
@@ -2,8 +2,8 @@
 #define TD_ALGO_BASE_H
 
 
-#include "cubeai/rl/algorithms/rl_algorithm_base.h"
-#include "cubeai/rl/worlds/envs_concepts.h"
+#include "cuberl/rl/algorithms/rl_algorithm_base.h"
+#include "cuberl/rl/worlds/envs_concepts.h"
 
 namespace cuberl {
 namespace rl::algos::td
diff --git a/include/cubeai/rl/algorithms/utils.h b/include/cuberl/rl/algorithms/utils.h
similarity index 98%
rename from include/cubeai/rl/algorithms/utils.h
rename to include/cuberl/rl/algorithms/utils.h
index a43cf2d..630c02f 100644
--- a/include/cubeai/rl/algorithms/utils.h
+++ b/include/cuberl/rl/algorithms/utils.h
@@ -6,8 +6,8 @@
 /// problems
 ///
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/vector_math.h"
 
 #include <vector>
 
diff --git a/include/cubeai/rl/episode_info.h b/include/cuberl/rl/episode_info.h
similarity index 95%
rename from include/cubeai/rl/episode_info.h
rename to include/cuberl/rl/episode_info.h
index df24649..d2bbe6a 100644
--- a/include/cubeai/rl/episode_info.h
+++ b/include/cuberl/rl/episode_info.h
@@ -1,7 +1,7 @@
 #ifndef EPISODE_INFO_H
 #define EPISODE_INFO_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/bitrl_consts.h"
 #include <chrono>
 #include <string>
diff --git a/include/cubeai/rl/epsilon_decay_options.h b/include/cuberl/rl/epsilon_decay_options.h
similarity index 94%
rename from include/cubeai/rl/epsilon_decay_options.h
rename to include/cuberl/rl/epsilon_decay_options.h
index 163a443..24df311 100644
--- a/include/cubeai/rl/epsilon_decay_options.h
+++ b/include/cuberl/rl/epsilon_decay_options.h
@@ -1,7 +1,7 @@
 #ifndef EPSILON_DECAY_OPTIONS_H
 #define EPSILON_DECAY_OPTIONS_H
 
-#include "cubeai/extern/enum.h"
+#include "cuberl/extern/enum.h"
 #include <string>
 
 namespace cuberl {
diff --git a/include/cubeai/rl/learning_rate_scheduler.h b/include/cuberl/rl/learning_rate_scheduler.h
similarity index 92%
rename from include/cubeai/rl/learning_rate_scheduler.h
rename to include/cuberl/rl/learning_rate_scheduler.h
index 850787b..473466b 100644
--- a/include/cubeai/rl/learning_rate_scheduler.h
+++ b/include/cuberl/rl/learning_rate_scheduler.h
@@ -3,7 +3,7 @@
 
 #ifndef LEARNING_RATE_SCHEDULER_H
 #define LEARNING_RATE_SCHEDULER_H
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 namespace cuberl{
 namespace rl{
diff --git a/include/cubeai/rl/policies/adaptors/policy_stochastic_adaptor.h b/include/cuberl/rl/policies/adaptors/policy_stochastic_adaptor.h
similarity index 96%
rename from include/cubeai/rl/policies/adaptors/policy_stochastic_adaptor.h
rename to include/cuberl/rl/policies/adaptors/policy_stochastic_adaptor.h
index dda1004..0d412b9 100644
--- a/include/cubeai/rl/policies/adaptors/policy_stochastic_adaptor.h
+++ b/include/cuberl/rl/policies/adaptors/policy_stochastic_adaptor.h
@@ -1,9 +1,9 @@
 #ifndef STOCHASTIC_ADAPTOR_POLICY_H
 #define STOCHASTIC_ADAPTOR_POLICY_H
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/vector_math.h"
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/vector_math.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef CUBERL_DEBUG
 #include <cassert>
diff --git a/include/cubeai/rl/policies/deterministic_action_policy.h b/include/cuberl/rl/policies/deterministic_action_policy.h
similarity index 100%
rename from include/cubeai/rl/policies/deterministic_action_policy.h
rename to include/cuberl/rl/policies/deterministic_action_policy.h
diff --git a/include/cubeai/rl/policies/epsilon_double_qtable_greedy_policy.h b/include/cuberl/rl/policies/epsilon_double_qtable_greedy_policy.h
similarity index 100%
rename from include/cubeai/rl/policies/epsilon_double_qtable_greedy_policy.h
rename to include/cuberl/rl/policies/epsilon_double_qtable_greedy_policy.h
diff --git a/include/cubeai/rl/policies/epsilon_greedy_policy.h b/include/cuberl/rl/policies/epsilon_greedy_policy.h
similarity index 95%
rename from include/cubeai/rl/policies/epsilon_greedy_policy.h
rename to include/cuberl/rl/policies/epsilon_greedy_policy.h
index 583ece5..6a5196f 100644
--- a/include/cubeai/rl/policies/epsilon_greedy_policy.h
+++ b/include/cuberl/rl/policies/epsilon_greedy_policy.h
@@ -1,13 +1,13 @@
 #ifndef EPSILON_GREEDY_POLICY_H
 #define EPSILON_GREEDY_POLICY_H
 
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/policies/max_tabular_policy.h"
-#include "cubeai/rl/policies/random_tabular_policy.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/policies/max_tabular_policy.h"
+#include "cuberl/rl/policies/random_tabular_policy.h"
 
 #ifdef USE_PYTORCH
-#include "cubeai/utils/torch_adaptor.h"
+#include "cuberl/utils/torch_adaptor.h"
 #endif
 
 #include <random>
diff --git a/include/cubeai/rl/policies/max_tabular_policy.h b/include/cuberl/rl/policies/max_tabular_policy.h
similarity index 96%
rename from include/cubeai/rl/policies/max_tabular_policy.h
rename to include/cuberl/rl/policies/max_tabular_policy.h
index b5d3a27..e310bcb 100644
--- a/include/cubeai/rl/policies/max_tabular_policy.h
+++ b/include/cuberl/rl/policies/max_tabular_policy.h
@@ -1,10 +1,10 @@
 #ifndef MAX_TABULAR_POLICY_H
 #define MAX_TABULAR_POLICY_H
 
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/algorithms/utils.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/algorithms/utils.h"
+#include "cuberl/maths/vector_math.h"
 
 #ifdef USE_PYTORCH
 #include <torch/torch.h>
diff --git a/include/cubeai/rl/policies/policy_base.h b/include/cuberl/rl/policies/policy_base.h
similarity index 100%
rename from include/cubeai/rl/policies/policy_base.h
rename to include/cuberl/rl/policies/policy_base.h
diff --git a/include/cubeai/rl/policies/policy_type.h b/include/cuberl/rl/policies/policy_type.h
similarity index 100%
rename from include/cubeai/rl/policies/policy_type.h
rename to include/cuberl/rl/policies/policy_type.h
diff --git a/include/cubeai/rl/policies/random_tabular_policy.h b/include/cuberl/rl/policies/random_tabular_policy.h
similarity index 96%
rename from include/cubeai/rl/policies/random_tabular_policy.h
rename to include/cuberl/rl/policies/random_tabular_policy.h
index 4d18ca7..40b52e2 100644
--- a/include/cubeai/rl/policies/random_tabular_policy.h
+++ b/include/cuberl/rl/policies/random_tabular_policy.h
@@ -1,9 +1,9 @@
 #ifndef RANDOM_TABULAR_POLICY_H
 #define RANDOM_TABULAR_POLICY_H
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/utils/torch_adaptor.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/utils/torch_adaptor.h"
 
 
 #ifdef USE_PYTORCH
diff --git a/include/cubeai/rl/policies/softmax_policy.h b/include/cuberl/rl/policies/softmax_policy.h
similarity index 92%
rename from include/cubeai/rl/policies/softmax_policy.h
rename to include/cuberl/rl/policies/softmax_policy.h
index f7cf259..e5389f5 100644
--- a/include/cubeai/rl/policies/softmax_policy.h
+++ b/include/cuberl/rl/policies/softmax_policy.h
@@ -2,9 +2,9 @@
 #define SOFTMAX_POLICY_H
 
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/policies/max_tabular_policy.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/policies/max_tabular_policy.h"
+#include "cuberl/maths/vector_math.h"
 
 
 namespace cuberl {
diff --git a/include/cubeai/rl/policies/torch_policy.h b/include/cuberl/rl/policies/torch_policy.h
similarity index 100%
rename from include/cubeai/rl/policies/torch_policy.h
rename to include/cuberl/rl/policies/torch_policy.h
diff --git a/include/cubeai/rl/policies/uniform_discrete_policy.h b/include/cuberl/rl/policies/uniform_discrete_policy.h
similarity index 98%
rename from include/cubeai/rl/policies/uniform_discrete_policy.h
rename to include/cuberl/rl/policies/uniform_discrete_policy.h
index 8243f9a..ea968bc 100644
--- a/include/cubeai/rl/policies/uniform_discrete_policy.h
+++ b/include/cuberl/rl/policies/uniform_discrete_policy.h
@@ -1,7 +1,7 @@
 #ifndef UNIFORM_DISCRETE_POLICY_H
 #define UNIFORM_DISCRETE_POLICY_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 #include <vector>
 #include <utility>
diff --git a/include/cubeai/rl/rl_mixins.h b/include/cuberl/rl/rl_mixins.h
similarity index 98%
rename from include/cubeai/rl/rl_mixins.h
rename to include/cuberl/rl/rl_mixins.h
index ae73c2d..dd4bf1b 100644
--- a/include/cubeai/rl/rl_mixins.h
+++ b/include/cuberl/rl/rl_mixins.h
@@ -4,9 +4,9 @@
   * Utility class used in the implementation
   * of RL algorithms
   * */
-#include "cubeai/base/cubeai_config.h"
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/epsilon_decay_options.h"
+#include "cuberl/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/epsilon_decay_options.h"
 
 
 #ifdef CUBERL_DEBUG
diff --git a/include/cubeai/rl/trainers/rl_serial_agent_trainer.h b/include/cuberl/rl/trainers/rl_serial_agent_trainer.h
similarity index 99%
rename from include/cubeai/rl/trainers/rl_serial_agent_trainer.h
rename to include/cuberl/rl/trainers/rl_serial_agent_trainer.h
index 53009b3..092f4c9 100644
--- a/include/cubeai/rl/trainers/rl_serial_agent_trainer.h
+++ b/include/cuberl/rl/trainers/rl_serial_agent_trainer.h
@@ -1,7 +1,7 @@
 #ifndef RL_SERIAL_AGENT_TRAINER_H
 #define RL_SERIAL_AGENT_TRAINER_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include "bitrl/bitrl_consts.h"
 
 #include "bitrl/utils/iterative_algorithm_result.h"
diff --git a/include/cubeai/rl/worlds/envs_concepts.h b/include/cuberl/rl/worlds/envs_concepts.h
similarity index 100%
rename from include/cubeai/rl/worlds/envs_concepts.h
rename to include/cuberl/rl/worlds/envs_concepts.h
diff --git a/include/cubeai/rl/worlds/with_dynamics_mixin.h b/include/cuberl/rl/worlds/with_dynamics_mixin.h
similarity index 100%
rename from include/cubeai/rl/worlds/with_dynamics_mixin.h
rename to include/cuberl/rl/worlds/with_dynamics_mixin.h
diff --git a/include/cubeai/utils/cubeai_concepts.h b/include/cuberl/utils/cubeai_concepts.h
similarity index 96%
rename from include/cubeai/utils/cubeai_concepts.h
rename to include/cuberl/utils/cubeai_concepts.h
index ed9e094..ee8e5ae 100644
--- a/include/cubeai/utils/cubeai_concepts.h
+++ b/include/cuberl/utils/cubeai_concepts.h
@@ -8,7 +8,7 @@
   * https://www.youtube.com/watch?v=N_kPd2OK1L8
   * */
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 #include "torch/torch.h"
diff --git a/include/cubeai/utils/cubeai_traits.h b/include/cuberl/utils/cubeai_traits.h
similarity index 100%
rename from include/cubeai/utils/cubeai_traits.h
rename to include/cuberl/utils/cubeai_traits.h
diff --git a/include/cubeai/utils/lambda_utils.h b/include/cuberl/utils/lambda_utils.h
similarity index 89%
rename from include/cubeai/utils/lambda_utils.h
rename to include/cuberl/utils/lambda_utils.h
index 2a2e157..9cd0b5e 100644
--- a/include/cubeai/utils/lambda_utils.h
+++ b/include/cuberl/utils/lambda_utils.h
@@ -1,7 +1,7 @@
 #ifndef LAMBDA_UTILS_H
 #define LAMBDA_UTILS_H
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include <iostream>
 
 namespace cuberl {
diff --git a/include/cubeai/utils/loss_type.h b/include/cuberl/utils/loss_type.h
similarity index 95%
rename from include/cubeai/utils/loss_type.h
rename to include/cuberl/utils/loss_type.h
index 6d8592c..4c8ead2 100644
--- a/include/cubeai/utils/loss_type.h
+++ b/include/cuberl/utils/loss_type.h
@@ -1,7 +1,7 @@
 #ifndef LOSS_TYPE_H
 #define LOSS_TYPE_H
 
-#include "cubeai/extern/enum.h"
+#include "cuberl/extern/enum.h"
 #include <string>
 
 namespace cubeai{
diff --git a/include/cubeai/utils/pytorch_loss_wrapper.h b/include/cuberl/utils/pytorch_loss_wrapper.h
similarity index 86%
rename from include/cubeai/utils/pytorch_loss_wrapper.h
rename to include/cuberl/utils/pytorch_loss_wrapper.h
index 06fd919..2c5f7f4 100644
--- a/include/cubeai/utils/pytorch_loss_wrapper.h
+++ b/include/cuberl/utils/pytorch_loss_wrapper.h
@@ -1,12 +1,12 @@
 #ifndef PYTORCH_LOSS_WRAPPER_H
 #define PYTORCH_LOSS_WRAPPER_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/utils/loss_type.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/utils/loss_type.h"
 #include <torch/torch.h>
 
 
diff --git a/include/cubeai/utils/torch_adaptor.h b/include/cuberl/utils/torch_adaptor.h
similarity index 97%
rename from include/cubeai/utils/torch_adaptor.h
rename to include/cuberl/utils/torch_adaptor.h
index 9ac1ccd..842c78c 100644
--- a/include/cubeai/utils/torch_adaptor.h
+++ b/include/cuberl/utils/torch_adaptor.h
@@ -1,11 +1,11 @@
 #ifndef TORCH_STATE_ADAPTOR_H
 #define TORCH_STATE_ADAPTOR_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 
 #include <torch/torch.h>
 #include <vector>
diff --git a/include/cubeai/utils/train_enum_type.h b/include/cuberl/utils/train_enum_type.h
similarity index 100%
rename from include/cubeai/utils/train_enum_type.h
rename to include/cuberl/utils/train_enum_type.h
diff --git a/src/cubeai/control/pid_controller.cpp b/src/cuberl/control/pid_controller.cpp
similarity index 94%
rename from src/cubeai/control/pid_controller.cpp
rename to src/cuberl/control/pid_controller.cpp
index 68ea5ac..33684fa 100644
--- a/src/cubeai/control/pid_controller.cpp
+++ b/src/cuberl/control/pid_controller.cpp
@@ -2,7 +2,7 @@
 // Created by alex on 10/11/25.
 //
 
-#include "cubeai/control/pid_controller.h"
+#include "cuberl/control/pid_controller.h"
 
 namespace cuberl
 {
diff --git a/src/cubeai/extern/HTTPRequest.hpp b/src/cuberl/extern/HTTPRequest.hpp
similarity index 100%
rename from src/cubeai/extern/HTTPRequest.hpp
rename to src/cuberl/extern/HTTPRequest.hpp
diff --git a/src/cubeai/extern/enum.h b/src/cuberl/extern/enum.h
similarity index 100%
rename from src/cubeai/extern/enum.h
rename to src/cuberl/extern/enum.h
diff --git a/src/cubeai/extern/nlohmann/json/json.hpp b/src/cuberl/extern/nlohmann/json/json.hpp
similarity index 100%
rename from src/cubeai/extern/nlohmann/json/json.hpp
rename to src/cuberl/extern/nlohmann/json/json.hpp
diff --git a/src/cubeai/extern/nlohmann/json/json_fwd.hpp b/src/cuberl/extern/nlohmann/json/json_fwd.hpp
similarity index 100%
rename from src/cubeai/extern/nlohmann/json/json_fwd.hpp
rename to src/cuberl/extern/nlohmann/json/json_fwd.hpp
diff --git a/src/cubeai/maths/optimization/pytorch_optimizer_factory.cpp b/src/cuberl/maths/optimization/pytorch_optimizer_factory.cpp
similarity index 95%
rename from src/cubeai/maths/optimization/pytorch_optimizer_factory.cpp
rename to src/cuberl/maths/optimization/pytorch_optimizer_factory.cpp
index 4af5f5d..1b108fe 100644
--- a/src/cubeai/maths/optimization/pytorch_optimizer_factory.cpp
+++ b/src/cuberl/maths/optimization/pytorch_optimizer_factory.cpp
@@ -1,8 +1,8 @@
-#include "cubeai/maths/optimization/pytorch_optimizer_factory.h"
+#include "cuberl/maths/optimization/pytorch_optimizer_factory.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
+#include "cuberl/base/cubeai_types.h"
 #include <exception>
 
 namespace cuberl{
diff --git a/src/cubeai/maths/statistics/distributions/torch_bernoulli_dist.cpp b/src/cuberl/maths/statistics/distributions/torch_bernoulli_dist.cpp
similarity index 97%
rename from src/cubeai/maths/statistics/distributions/torch_bernoulli_dist.cpp
rename to src/cuberl/maths/statistics/distributions/torch_bernoulli_dist.cpp
index 3d55a83..f3ec7f0 100644
--- a/src/cubeai/maths/statistics/distributions/torch_bernoulli_dist.cpp
+++ b/src/cuberl/maths/statistics/distributions/torch_bernoulli_dist.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include "cubeai/maths/statistics/distributions/torch_bernoulli_dist.h"
+#include "cuberl/maths/statistics/distributions/torch_bernoulli_dist.h"
 
 #ifdef USE_PYTORCH
 
diff --git a/src/cubeai/maths/statistics/distributions/torch_categorical.cpp b/src/cuberl/maths/statistics/distributions/torch_categorical.cpp
similarity index 97%
rename from src/cubeai/maths/statistics/distributions/torch_categorical.cpp
rename to src/cuberl/maths/statistics/distributions/torch_categorical.cpp
index d8f9144..349ed68 100644
--- a/src/cubeai/maths/statistics/distributions/torch_categorical.cpp
+++ b/src/cuberl/maths/statistics/distributions/torch_categorical.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/maths/statistics/distributions/torch_categorical.h"
+#include "cuberl/maths/statistics/distributions/torch_categorical.h"
 
 #ifdef USE_PYTORCH
 
diff --git a/src/cubeai/maths/statistics/distributions/torch_distribution.cpp b/src/cuberl/maths/statistics/distributions/torch_distribution.cpp
similarity index 91%
rename from src/cubeai/maths/statistics/distributions/torch_distribution.cpp
rename to src/cuberl/maths/statistics/distributions/torch_distribution.cpp
index 8edc2ef..177d80a 100644
--- a/src/cubeai/maths/statistics/distributions/torch_distribution.cpp
+++ b/src/cuberl/maths/statistics/distributions/torch_distribution.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/maths/statistics/distributions/torch_distribution.h"
+#include "cuberl/maths/statistics/distributions/torch_distribution.h"
 
 #ifdef USE_PYTORCH
 
diff --git a/src/cubeai/maths/statistics/distributions/torch_normal.cpp b/src/cuberl/maths/statistics/distributions/torch_normal.cpp
similarity index 93%
rename from src/cubeai/maths/statistics/distributions/torch_normal.cpp
rename to src/cuberl/maths/statistics/distributions/torch_normal.cpp
index 83e0ad9..ea6c7f3 100644
--- a/src/cubeai/maths/statistics/distributions/torch_normal.cpp
+++ b/src/cuberl/maths/statistics/distributions/torch_normal.cpp
@@ -1,7 +1,7 @@
 //
 // Created by alex on 7/26/25.
 //
-#include "cubeai/maths/statistics//distributions/torch_normal.h"
+#include "cuberl/maths/statistics//distributions/torch_normal.h"
 
 
 #ifdef USE_PYTORCH
diff --git a/src/cubeai/maths/vector_math.cpp b/src/cuberl/maths/vector_math.cpp
similarity index 96%
rename from src/cubeai/maths/vector_math.cpp
rename to src/cuberl/maths/vector_math.cpp
index b42ef0f..8364df2 100644
--- a/src/cubeai/maths/vector_math.cpp
+++ b/src/cuberl/maths/vector_math.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/maths/vector_math.h"
 #include <cmath>
 #include <algorithm>
 
diff --git a/src/cubeai/planning/diff_drive_dynamic_window.cpp b/src/cuberl/planning/diff_drive_dynamic_window.cpp
similarity index 100%
rename from src/cubeai/planning/diff_drive_dynamic_window.cpp
rename to src/cuberl/planning/diff_drive_dynamic_window.cpp
diff --git a/src/cubeai/rl/algorithms/pg/a2c_config.cpp b/src/cuberl/rl/algorithms/pg/a2c_config.cpp
similarity index 94%
rename from src/cubeai/rl/algorithms/pg/a2c_config.cpp
rename to src/cuberl/rl/algorithms/pg/a2c_config.cpp
index 7be2caf..82c64e3 100644
--- a/src/cubeai/rl/algorithms/pg/a2c_config.cpp
+++ b/src/cuberl/rl/algorithms/pg/a2c_config.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/rl/algorithms/pg/a2c_config.h"
+#include "cuberl/rl/algorithms/pg/a2c_config.h"
 #include "bitrl/utils/io/json_file_reader.h"
 #include <boost/log/trivial.hpp>
 
diff --git a/src/cubeai/rl/algorithms/pg/ppo_config.cpp b/src/cuberl/rl/algorithms/pg/ppo_config.cpp
similarity index 95%
rename from src/cubeai/rl/algorithms/pg/ppo_config.cpp
rename to src/cuberl/rl/algorithms/pg/ppo_config.cpp
index 68ae18a..ed3d9a3 100644
--- a/src/cubeai/rl/algorithms/pg/ppo_config.cpp
+++ b/src/cuberl/rl/algorithms/pg/ppo_config.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/rl/algorithms/pg/ppo_config.h"
+#include "cuberl/rl/algorithms/pg/ppo_config.h"
 #include "bitrl/utils/io/json_file_reader.h"
 #include <boost/log/trivial.hpp>
 
diff --git a/src/cubeai/rl/algorithms/pg/reinforce_config.cpp b/src/cuberl/rl/algorithms/pg/reinforce_config.cpp
similarity index 94%
rename from src/cubeai/rl/algorithms/pg/reinforce_config.cpp
rename to src/cuberl/rl/algorithms/pg/reinforce_config.cpp
index 1e0f9d3..11f3920 100644
--- a/src/cubeai/rl/algorithms/pg/reinforce_config.cpp
+++ b/src/cuberl/rl/algorithms/pg/reinforce_config.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/rl/algorithms/pg/reinforce_config.h"
+#include "cuberl/rl/algorithms/pg/reinforce_config.h"
 #include "bitrl/utils/io/json_file_reader.h"
 #include <boost/log/trivial.hpp>
 
diff --git a/src/cubeai/rl/algorithms/pg/reinforce_loss.cpp b/src/cuberl/rl/algorithms/pg/reinforce_loss.cpp
similarity index 93%
rename from src/cubeai/rl/algorithms/pg/reinforce_loss.cpp
rename to src/cuberl/rl/algorithms/pg/reinforce_loss.cpp
index d172356..d320bef 100644
--- a/src/cubeai/rl/algorithms/pg/reinforce_loss.cpp
+++ b/src/cuberl/rl/algorithms/pg/reinforce_loss.cpp
@@ -1,12 +1,12 @@
 #ifndef REINFORCE_LOSS_H
 #define REINFORCE_LOSS_H
 
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/vector_math.h"
 #include <vector>
 #include <algorithm>
 
diff --git a/src/cubeai/rl/episode_info.cpp b/src/cuberl/rl/episode_info.cpp
similarity index 92%
rename from src/cubeai/rl/episode_info.cpp
rename to src/cuberl/rl/episode_info.cpp
index 42c08ba..615819b 100644
--- a/src/cubeai/rl/episode_info.cpp
+++ b/src/cuberl/rl/episode_info.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/rl/episode_info.h"
+#include "cuberl/rl/episode_info.h"
 
 namespace cuberl{
 namespace rl{
diff --git a/src/cubeai/rl/policies/epsilon_greedy_policy.cpp b/src/cuberl/rl/policies/epsilon_greedy_policy.cpp
similarity index 97%
rename from src/cubeai/rl/policies/epsilon_greedy_policy.cpp
rename to src/cuberl/rl/policies/epsilon_greedy_policy.cpp
index 2b71b60..0de47d0 100644
--- a/src/cubeai/rl/policies/epsilon_greedy_policy.cpp
+++ b/src/cuberl/rl/policies/epsilon_greedy_policy.cpp
@@ -1,7 +1,7 @@
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
 
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef CUBERL_DEBUG
 #include <cassert>
diff --git a/src/cubeai/rl/policies/max_tabular_policy.cpp b/src/cuberl/rl/policies/max_tabular_policy.cpp
similarity index 95%
rename from src/cubeai/rl/policies/max_tabular_policy.cpp
rename to src/cuberl/rl/policies/max_tabular_policy.cpp
index 48e1e37..dabe2f9 100644
--- a/src/cubeai/rl/policies/max_tabular_policy.cpp
+++ b/src/cuberl/rl/policies/max_tabular_policy.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/rl/policies/max_tabular_policy.h"
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/rl/policies/max_tabular_policy.h"
+#include "cuberl/base/cubeai_config.h"
 #include "bitrl/utils/io/csv_file_writer.h"
 
 #include <vector>
diff --git a/src/cubeai/rl/policies/random_tabular_policy.cpp b/src/cuberl/rl/policies/random_tabular_policy.cpp
similarity index 92%
rename from src/cubeai/rl/policies/random_tabular_policy.cpp
rename to src/cuberl/rl/policies/random_tabular_policy.cpp
index 3061df5..2657292 100644
--- a/src/cubeai/rl/policies/random_tabular_policy.cpp
+++ b/src/cuberl/rl/policies/random_tabular_policy.cpp
@@ -1,6 +1,6 @@
-#include "cubeai/rl/policies/random_tabular_policy.h"
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/rl/policies/random_tabular_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/base/cubeai_config.h"
 
 #ifdef CUBERL_DEBUG
 #include <cassert>
diff --git a/src/cubeai/rl/policies/softmax_policy.cpp b/src/cuberl/rl/policies/softmax_policy.cpp
similarity index 90%
rename from src/cubeai/rl/policies/softmax_policy.cpp
rename to src/cuberl/rl/policies/softmax_policy.cpp
index ae8d0b0..2dd6f52 100644
--- a/src/cubeai/rl/policies/softmax_policy.cpp
+++ b/src/cuberl/rl/policies/softmax_policy.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/rl/policies/softmax_policy.h"
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/rl/policies/softmax_policy.h"
+#include "cuberl/base/cubeai_config.h"
 
 #include <vector>
 #include <algorithm>
diff --git a/src/cubeai/rl/policies/torch_policy.cpp b/src/cuberl/rl/policies/torch_policy.cpp
similarity index 100%
rename from src/cubeai/rl/policies/torch_policy.cpp
rename to src/cuberl/rl/policies/torch_policy.cpp
diff --git a/src/cubeai/rl/policies/uniform_discrete_policy.cpp b/src/cuberl/rl/policies/uniform_discrete_policy.cpp
similarity index 97%
rename from src/cubeai/rl/policies/uniform_discrete_policy.cpp
rename to src/cuberl/rl/policies/uniform_discrete_policy.cpp
index d0821f5..ed00419 100644
--- a/src/cubeai/rl/policies/uniform_discrete_policy.cpp
+++ b/src/cuberl/rl/policies/uniform_discrete_policy.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/rl/policies/uniform_discrete_policy.h"
-#include "cubeai/rl/policies/policy_type.h"
+#include "cuberl/rl/policies/uniform_discrete_policy.h"
+#include "cuberl/rl/policies/policy_type.h"
 
 #ifdef CUBERL_DEBUG
 #include <cassert>
diff --git a/src/cubeai/rl/rl_mixins.cpp b/src/cuberl/rl/rl_mixins.cpp
similarity index 98%
rename from src/cubeai/rl/rl_mixins.cpp
rename to src/cuberl/rl/rl_mixins.cpp
index a64d245..71c3247 100644
--- a/src/cubeai/rl/rl_mixins.cpp
+++ b/src/cuberl/rl/rl_mixins.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/rl/rl_mixins.h"
+#include "cuberl/rl/rl_mixins.h"
 #include <cmath>
 
 namespace cuberl::rl{
diff --git a/src/cubeai/utils/pytorch_loss_wrapper.cpp b/src/cuberl/utils/pytorch_loss_wrapper.cpp
similarity index 94%
rename from src/cubeai/utils/pytorch_loss_wrapper.cpp
rename to src/cuberl/utils/pytorch_loss_wrapper.cpp
index 4156be2..0bd2a6a 100644
--- a/src/cubeai/utils/pytorch_loss_wrapper.cpp
+++ b/src/cuberl/utils/pytorch_loss_wrapper.cpp
@@ -1,4 +1,4 @@
-#include "cubeai/utils/pytorch_loss_wrapper.h"
+#include "cuberl/utils/pytorch_loss_wrapper.h"
 
 #ifdef USE_PYTORCH
 
diff --git a/src/cubeai/utils/torch_adaptor.cpp b/src/cuberl/utils/torch_adaptor.cpp
similarity index 99%
rename from src/cubeai/utils/torch_adaptor.cpp
rename to src/cuberl/utils/torch_adaptor.cpp
index 6af85b1..67e9848 100644
--- a/src/cubeai/utils/torch_adaptor.cpp
+++ b/src/cuberl/utils/torch_adaptor.cpp
@@ -1,9 +1,9 @@
-#include "cubeai/base/cubeai_config.h"
+#include "cuberl/base/cubeai_config.h"
 
 
 #ifdef USE_PYTORCH
 
-#include "cubeai/utils/torch_adaptor.h"
+#include "cuberl/utils/torch_adaptor.h"
 #include <torch/torch.h>
 #include <vector>
 
diff --git a/tests/test_experience_buffer/test_experience_buffer.cpp b/tests/test_experience_buffer/test_experience_buffer.cpp
index ab5b086..fcc8f4c 100644
--- a/tests/test_experience_buffer/test_experience_buffer.cpp
+++ b/tests/test_experience_buffer/test_experience_buffer.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/data_structs/experience_buffer.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/data_structs/experience_buffer.h"
 
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/tests/test_maths/test_vector_math/test_vector_math.cpp b/tests/test_maths/test_vector_math/test_vector_math.cpp
index 1a19341..f961405 100644
--- a/tests/test_maths/test_vector_math/test_vector_math.cpp
+++ b/tests/test_maths/test_vector_math/test_vector_math.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/maths/vector_math.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/maths/vector_math.h"
 
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/tests/test_policies/test_epsilon_greedy_policy/test_epsilon_greedy_policy.cpp b/tests/test_policies/test_epsilon_greedy_policy/test_epsilon_greedy_policy.cpp
index eb39a0c..d8ec216 100644
--- a/tests/test_policies/test_epsilon_greedy_policy/test_epsilon_greedy_policy.cpp
+++ b/tests/test_policies/test_epsilon_greedy_policy/test_epsilon_greedy_policy.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/policies/epsilon_greedy_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/policies/epsilon_greedy_policy.h"
 
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/tests/test_policies/test_max_tabular_policy/test_max_tabular_policy.cpp b/tests/test_policies/test_max_tabular_policy/test_max_tabular_policy.cpp
index f00fa6d..56c5464 100644
--- a/tests/test_policies/test_max_tabular_policy/test_max_tabular_policy.cpp
+++ b/tests/test_policies/test_max_tabular_policy/test_max_tabular_policy.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/policies/max_tabular_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/policies/max_tabular_policy.h"
 
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/tests/test_policies/test_random_tabular_policy/test_random_tabular_policy.cpp b/tests/test_policies/test_random_tabular_policy/test_random_tabular_policy.cpp
index 51f4b15..b25d4c4 100644
--- a/tests/test_policies/test_random_tabular_policy/test_random_tabular_policy.cpp
+++ b/tests/test_policies/test_random_tabular_policy/test_random_tabular_policy.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/policies/random_tabular_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/policies/random_tabular_policy.h"
 
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/tests/test_policies/test_softmax_policy/test_softmax_policy.cpp b/tests/test_policies/test_softmax_policy/test_softmax_policy.cpp
index 33a6ff8..1c7700b 100644
--- a/tests/test_policies/test_softmax_policy/test_softmax_policy.cpp
+++ b/tests/test_policies/test_softmax_policy/test_softmax_policy.cpp
@@ -1,5 +1,5 @@
-#include "cubeai/base/cubeai_types.h"
-#include "cubeai/rl/policies/softmax_policy.h"
+#include "cuberl/base/cubeai_types.h"
+#include "cuberl/rl/policies/softmax_policy.h"
 
 #include <gtest/gtest.h>
 #include <vector>