From 1a174b98be665d2085bb514652576b7ce001b704 Mon Sep 17 00:00:00 2001
From: Malte Laurin Matthey <malte.matthey@student.kit.edu>
Date: Fri, 17 Jan 2025 00:10:52 +0100
Subject: [PATCH] Refactor structure: Organize into 'ui', 'script_execution',
 'task_management' and 'common'; add CMakeLists.

---
 .../src/learn_environment/CMakeLists.txt      | 41 +++++--------------
 .../folder_structure_constants.hpp            |  0
 .../notebook_converter.hpp                    |  1 +
 .../{learn_environment => common}/task.hpp    |  0
 .../learn_environment.hpp                     |  6 +--
 .../process_runner.hpp                        |  0
 .../script_worker.hpp                         |  2 +-
 .../task_executor.hpp                         |  2 +-
 .../task_manager.hpp                          |  4 +-
 .../task_parser.hpp                           |  2 +-
 .../custom_list_widget.hpp                    |  0
 .../execute_frame.hpp                         |  0
 .../{learn_environment => ui}/sidebar.hpp     |  4 +-
 .../subtask_item.hpp                          |  8 ++--
 .../{learn_environment => ui}/task_ui.hpp     |  8 ++--
 .../{learn_environment => ui}/toast.hpp       |  0
 .../src/common/CMakeLists.txt                 | 17 ++++++++
 .../src/{ => common}/notebook_converter.cpp   |  7 +++-
 .../src/learn_environment.cpp                 |  4 +-
 .../src/script_execution/CMakeLists.txt       | 20 +++++++++
 .../{ => script_execution}/process_runner.cpp |  2 +-
 .../{ => script_execution}/script_worker.cpp  |  4 +-
 .../{ => script_execution}/task_executor.cpp  |  6 +--
 .../src/task_management/CMakeLists.txt        | 20 +++++++++
 .../{ => task_management}/task_manager.cpp    | 12 +++---
 .../src/{ => task_management}/task_parser.cpp |  4 +-
 .../learn_environment/src/ui/CMakeLists.txt   | 24 +++++++++++
 .../src/{ => ui}/custom_list_widget.cpp       |  2 +-
 .../src/{ => ui}/execute_frame.cpp            |  2 +-
 .../src/{ => ui}/sidebar.cpp                  |  6 +--
 .../src/{ => ui}/subtask_item.cpp             |  6 +--
 .../src/{ => ui}/task_ui.cpp                  |  4 +-
 .../learn_environment/src/{ => ui}/toast.cpp  |  2 +-
 33 files changed, 142 insertions(+), 78 deletions(-)
 rename catkin_ws/src/learn_environment/include/{learn_environment => common}/folder_structure_constants.hpp (100%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => common}/notebook_converter.hpp (99%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => common}/task.hpp (100%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => }/learn_environment.hpp (95%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => script_execution}/process_runner.hpp (100%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => script_execution}/script_worker.hpp (98%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => script_execution}/task_executor.hpp (98%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => task_management}/task_manager.hpp (98%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => task_management}/task_parser.hpp (98%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => ui}/custom_list_widget.hpp (100%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => ui}/execute_frame.hpp (100%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => ui}/sidebar.hpp (96%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => ui}/subtask_item.hpp (96%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => ui}/task_ui.hpp (97%)
 rename catkin_ws/src/learn_environment/include/{learn_environment => ui}/toast.hpp (100%)
 create mode 100644 catkin_ws/src/learn_environment/src/common/CMakeLists.txt
 rename catkin_ws/src/learn_environment/src/{ => common}/notebook_converter.cpp (99%)
 create mode 100644 catkin_ws/src/learn_environment/src/script_execution/CMakeLists.txt
 rename catkin_ws/src/learn_environment/src/{ => script_execution}/process_runner.cpp (98%)
 rename catkin_ws/src/learn_environment/src/{ => script_execution}/script_worker.cpp (99%)
 rename catkin_ws/src/learn_environment/src/{ => script_execution}/task_executor.cpp (96%)
 create mode 100644 catkin_ws/src/learn_environment/src/task_management/CMakeLists.txt
 rename catkin_ws/src/learn_environment/src/{ => task_management}/task_manager.cpp (97%)
 rename catkin_ws/src/learn_environment/src/{ => task_management}/task_parser.cpp (98%)
 create mode 100644 catkin_ws/src/learn_environment/src/ui/CMakeLists.txt
 rename catkin_ws/src/learn_environment/src/{ => ui}/custom_list_widget.cpp (97%)
 rename catkin_ws/src/learn_environment/src/{ => ui}/execute_frame.cpp (98%)
 rename catkin_ws/src/learn_environment/src/{ => ui}/sidebar.cpp (96%)
 rename catkin_ws/src/learn_environment/src/{ => ui}/subtask_item.cpp (99%)
 rename catkin_ws/src/learn_environment/src/{ => ui}/task_ui.cpp (99%)
 rename catkin_ws/src/learn_environment/src/{ => ui}/toast.cpp (98%)

diff --git a/catkin_ws/src/learn_environment/CMakeLists.txt b/catkin_ws/src/learn_environment/CMakeLists.txt
index 3c96415..7e3dc76 100644
--- a/catkin_ws/src/learn_environment/CMakeLists.txt
+++ b/catkin_ws/src/learn_environment/CMakeLists.txt
@@ -35,46 +35,23 @@ include_directories(
   /usr/include/nlohmann
 )
 
-set(CMAKE_AUTOMOC ON)
-
 ## Include Qt libraries, only compatible with RViz using Qt5
 find_package(Qt5 ${rviz_QT_VERSION} EXACT REQUIRED Core Widgets)
 set(QT_LIBRARIES Qt5::Widgets)
 
 add_definitions(-DQT_NO_KEYWORDS)
 
+add_subdirectory(src/task_management)
+add_subdirectory(src/ui)
+add_subdirectory(src/script_execution)
+add_subdirectory(src/common)
+
 set(${PROJECT_NAME}_HDRS
-  include/${PROJECT_NAME}/learn_environment.hpp
-  include/${PROJECT_NAME}/subtask_item.hpp
-  include/${PROJECT_NAME}/task_manager.hpp
-  include/${PROJECT_NAME}/task.hpp
-  include/${PROJECT_NAME}/custom_list_widget.hpp
-  include/${PROJECT_NAME}/sidebar.hpp
-  include/${PROJECT_NAME}/task_parser.hpp
-  include/${PROJECT_NAME}/task_executor.hpp
-  include/${PROJECT_NAME}/script_worker.hpp
-  include/${PROJECT_NAME}/process_runner.hpp
-  include/${PROJECT_NAME}/task_ui.hpp
-  include/${PROJECT_NAME}/notebook_converter.hpp
-  include/${PROJECT_NAME}/folder_structure_constants.hpp
-  include/${PROJECT_NAME}/execute_frame.hpp
-  include/${PROJECT_NAME}/toast.hpp
+  include/learn_environment.hpp
 )
 
 set(${PROJECT_NAME}_SRCS
   src/learn_environment.cpp
-  src/subtask_item.cpp
-  src/task_manager.cpp
-  src/custom_list_widget.cpp
-  src/sidebar.cpp
-  src/task_parser.cpp
-  src/task_executor.cpp
-  src/script_worker.cpp
-  src/process_runner.cpp
-  src/task_ui.cpp
-  src/notebook_converter.cpp
-  src/execute_frame.cpp
-  src/toast.cpp
 )
 
 set(${PROJECT_NAME}_UIS
@@ -103,7 +80,7 @@ add_library(learn_environment
   ${${PROJECT_NAME}_MOCS}
   ${${PROJECT_NAME}_QRC_SOURCES}
   ${${PROJECT_NAME}_UIS}
-  ${${PROJECT_NAME}_QRC} 
+  ${${PROJECT_NAME}_QRC}
 )
 
 target_link_libraries(learn_environment
@@ -112,4 +89,8 @@ target_link_libraries(learn_environment
   Qt5::Widgets
   ${QT_LIBRARIES}
   ${topic_tools_LIBRARIES}
+  task_management
+  ui
+  script_execution
+  common
 )
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/folder_structure_constants.hpp b/catkin_ws/src/learn_environment/include/common/folder_structure_constants.hpp
similarity index 100%
rename from catkin_ws/src/learn_environment/include/learn_environment/folder_structure_constants.hpp
rename to catkin_ws/src/learn_environment/include/common/folder_structure_constants.hpp
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/notebook_converter.hpp b/catkin_ws/src/learn_environment/include/common/notebook_converter.hpp
similarity index 99%
rename from catkin_ws/src/learn_environment/include/learn_environment/notebook_converter.hpp
rename to catkin_ws/src/learn_environment/include/common/notebook_converter.hpp
index 25702d9..21381d4 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/notebook_converter.hpp
+++ b/catkin_ws/src/learn_environment/include/common/notebook_converter.hpp
@@ -24,6 +24,7 @@ class NotebookConverter : public QObject {
     Q_OBJECT
 public:
     explicit NotebookConverter(QObject *parent = nullptr);
+    ~NotebookConverter();
 
     /**
      * @brief Converts a Jupyter notebook to a Python script. Ignoring code cells with "solution" tag.
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/task.hpp b/catkin_ws/src/learn_environment/include/common/task.hpp
similarity index 100%
rename from catkin_ws/src/learn_environment/include/learn_environment/task.hpp
rename to catkin_ws/src/learn_environment/include/common/task.hpp
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/learn_environment.hpp b/catkin_ws/src/learn_environment/include/learn_environment.hpp
similarity index 95%
rename from catkin_ws/src/learn_environment/include/learn_environment/learn_environment.hpp
rename to catkin_ws/src/learn_environment/include/learn_environment.hpp
index bd43e9c..a7d4f9c 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/learn_environment.hpp
+++ b/catkin_ws/src/learn_environment/include/learn_environment.hpp
@@ -3,9 +3,9 @@
 
 #include <rviz/panel.h>
 #include <ui_learn_environment.h>
-#include "task_manager.hpp"
-#include "task_ui.hpp"
-#include "notebook_converter.hpp"
+#include "task_management/task_manager.hpp"
+#include "ui/task_ui.hpp"
+#include "common/notebook_converter.hpp"
 
 #include <QWidget>
 #include <QObject>
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/process_runner.hpp b/catkin_ws/src/learn_environment/include/script_execution/process_runner.hpp
similarity index 100%
rename from catkin_ws/src/learn_environment/include/learn_environment/process_runner.hpp
rename to catkin_ws/src/learn_environment/include/script_execution/process_runner.hpp
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/script_worker.hpp b/catkin_ws/src/learn_environment/include/script_execution/script_worker.hpp
similarity index 98%
rename from catkin_ws/src/learn_environment/include/learn_environment/script_worker.hpp
rename to catkin_ws/src/learn_environment/include/script_execution/script_worker.hpp
index 6ccb741..02562e0 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/script_worker.hpp
+++ b/catkin_ws/src/learn_environment/include/script_execution/script_worker.hpp
@@ -6,7 +6,7 @@
 #include <QProcess>
 #include <QList>
 
-#include "notebook_converter.hpp"
+#include "common/notebook_converter.hpp"
 
 class ProcessRunner;
 
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/task_executor.hpp b/catkin_ws/src/learn_environment/include/script_execution/task_executor.hpp
similarity index 98%
rename from catkin_ws/src/learn_environment/include/learn_environment/task_executor.hpp
rename to catkin_ws/src/learn_environment/include/script_execution/task_executor.hpp
index d0be757..be64656 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/task_executor.hpp
+++ b/catkin_ws/src/learn_environment/include/script_execution/task_executor.hpp
@@ -1,7 +1,7 @@
 #ifndef TASK_EXECUTOR_HPP
 #define TASK_EXECUTOR_HPP
 
-#include "task.hpp"
+#include "common/task.hpp"
 
 #include <QObject>
 #include <QString>
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/task_manager.hpp b/catkin_ws/src/learn_environment/include/task_management/task_manager.hpp
similarity index 98%
rename from catkin_ws/src/learn_environment/include/learn_environment/task_manager.hpp
rename to catkin_ws/src/learn_environment/include/task_management/task_manager.hpp
index 78d4ae3..337bd7a 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/task_manager.hpp
+++ b/catkin_ws/src/learn_environment/include/task_management/task_manager.hpp
@@ -1,8 +1,8 @@
 #ifndef TASKMANAGER_HPP
 #define TASKMANAGER_HPP
 
-#include "task.hpp"
-#include "task_executor.hpp"
+#include "common/task.hpp"
+#include "script_execution/task_executor.hpp"
 
 #include <QObject>
 #include <QVector>
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/task_parser.hpp b/catkin_ws/src/learn_environment/include/task_management/task_parser.hpp
similarity index 98%
rename from catkin_ws/src/learn_environment/include/learn_environment/task_parser.hpp
rename to catkin_ws/src/learn_environment/include/task_management/task_parser.hpp
index 79e6e22..988039e 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/task_parser.hpp
+++ b/catkin_ws/src/learn_environment/include/task_management/task_parser.hpp
@@ -1,7 +1,7 @@
 #ifndef TASK_PARSER_HPP
 #define TASK_PARSER_HPP
 
-#include "task.hpp"
+#include "common/task.hpp"
 
 #include <QVector>
 #include <QString>
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/custom_list_widget.hpp b/catkin_ws/src/learn_environment/include/ui/custom_list_widget.hpp
similarity index 100%
rename from catkin_ws/src/learn_environment/include/learn_environment/custom_list_widget.hpp
rename to catkin_ws/src/learn_environment/include/ui/custom_list_widget.hpp
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/execute_frame.hpp b/catkin_ws/src/learn_environment/include/ui/execute_frame.hpp
similarity index 100%
rename from catkin_ws/src/learn_environment/include/learn_environment/execute_frame.hpp
rename to catkin_ws/src/learn_environment/include/ui/execute_frame.hpp
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/sidebar.hpp b/catkin_ws/src/learn_environment/include/ui/sidebar.hpp
similarity index 96%
rename from catkin_ws/src/learn_environment/include/learn_environment/sidebar.hpp
rename to catkin_ws/src/learn_environment/include/ui/sidebar.hpp
index af1228f..a810590 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/sidebar.hpp
+++ b/catkin_ws/src/learn_environment/include/ui/sidebar.hpp
@@ -1,8 +1,8 @@
 #ifndef SIDEBAR_HPP
 #define SIDEBAR_HPP
 
-#include "custom_list_widget.hpp"
-#include "task.hpp"
+#include "ui/custom_list_widget.hpp"
+#include "common/task.hpp"
 
 #include <QWidget>
 #include <QVBoxLayout>
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/subtask_item.hpp b/catkin_ws/src/learn_environment/include/ui/subtask_item.hpp
similarity index 96%
rename from catkin_ws/src/learn_environment/include/learn_environment/subtask_item.hpp
rename to catkin_ws/src/learn_environment/include/ui/subtask_item.hpp
index 2b2a447..7b078e0 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/subtask_item.hpp
+++ b/catkin_ws/src/learn_environment/include/ui/subtask_item.hpp
@@ -1,10 +1,10 @@
 #ifndef SUBTASK_ITEM_HPP
 #define SUBTASK_ITEM_HPP
 
-#include "task.hpp"
-#include "task_manager.hpp"
-#include "execute_frame.hpp"
-#include "toast.hpp"
+#include "common/task.hpp"
+#include "task_management/task_manager.hpp"
+#include "ui/execute_frame.hpp"
+#include "ui/toast.hpp"
 
 #include <QWidget>
 #include <QPushButton>
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/task_ui.hpp b/catkin_ws/src/learn_environment/include/ui/task_ui.hpp
similarity index 97%
rename from catkin_ws/src/learn_environment/include/learn_environment/task_ui.hpp
rename to catkin_ws/src/learn_environment/include/ui/task_ui.hpp
index 4e2d939..a31451a 100644
--- a/catkin_ws/src/learn_environment/include/learn_environment/task_ui.hpp
+++ b/catkin_ws/src/learn_environment/include/ui/task_ui.hpp
@@ -1,10 +1,10 @@
 #ifndef TASKUI_HPP
 #define TASKUI_HPP
 
-#include "sidebar.hpp"
-#include "task.hpp"
-#include "task_manager.hpp"
-#include "execute_frame.hpp"
+#include "ui/sidebar.hpp"
+#include "common/task.hpp"
+#include "task_management/task_manager.hpp"
+#include "ui/execute_frame.hpp"
 
 #include <QObject>
 #include <QVBoxLayout>
diff --git a/catkin_ws/src/learn_environment/include/learn_environment/toast.hpp b/catkin_ws/src/learn_environment/include/ui/toast.hpp
similarity index 100%
rename from catkin_ws/src/learn_environment/include/learn_environment/toast.hpp
rename to catkin_ws/src/learn_environment/include/ui/toast.hpp
diff --git a/catkin_ws/src/learn_environment/src/common/CMakeLists.txt b/catkin_ws/src/learn_environment/src/common/CMakeLists.txt
new file mode 100644
index 0000000..d295587
--- /dev/null
+++ b/catkin_ws/src/learn_environment/src/common/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.0.2)
+
+add_library(common
+    notebook_converter.cpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/common/folder_structure_constants.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/common/notebook_converter.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/common/task.hpp
+)
+
+target_include_directories(common PUBLIC ${CMAKE_SOURCE_DIR}/include/common)
+
+target_link_libraries(common
+    Qt5::Core
+    Qt5::Widgets
+    ${QT_LIBRARIES}
+    ${catkin_LIBRARIES}
+)
\ No newline at end of file
diff --git a/catkin_ws/src/learn_environment/src/notebook_converter.cpp b/catkin_ws/src/learn_environment/src/common/notebook_converter.cpp
similarity index 99%
rename from catkin_ws/src/learn_environment/src/notebook_converter.cpp
rename to catkin_ws/src/learn_environment/src/common/notebook_converter.cpp
index 42ba6eb..d3f269b 100644
--- a/catkin_ws/src/learn_environment/src/notebook_converter.cpp
+++ b/catkin_ws/src/learn_environment/src/common/notebook_converter.cpp
@@ -1,10 +1,11 @@
-#include "learn_environment/notebook_converter.hpp"
+#include "common/notebook_converter.hpp"
+#include "common/folder_structure_constants.hpp"
+
 #include <QFile>
 #include <QTextStream>
 #include <QDebug>
 #include <unordered_map>
 #include <nlohmann/json.hpp>
-#include "learn_environment/folder_structure_constants.hpp"
 #include <ros/package.h>
 #include <ros/ros.h>
 
@@ -25,6 +26,8 @@ const QString SOLUTION_CODE_PLACEHOLDER_END = "# ↑↑↑↑ SOLUTION CODE HERE
 
 NotebookConverter::NotebookConverter(QObject *parent) : QObject(parent) {}
 
+NotebookConverter::~NotebookConverter() {}
+
 bool NotebookConverter::convertNotebook(const QString &notebookPath) {
     QFile inputFile(notebookPath);
     if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
diff --git a/catkin_ws/src/learn_environment/src/learn_environment.cpp b/catkin_ws/src/learn_environment/src/learn_environment.cpp
index 5df964a..f826991 100644
--- a/catkin_ws/src/learn_environment/src/learn_environment.cpp
+++ b/catkin_ws/src/learn_environment/src/learn_environment.cpp
@@ -1,6 +1,4 @@
-#include "learn_environment/learn_environment.hpp"
-#include "learn_environment/task_manager.hpp"
-#include "learn_environment/task_ui.hpp"
+#include "learn_environment.hpp"
 #include <pluginlib/class_list_macros.hpp>
 
 #include <QMainWindow>
diff --git a/catkin_ws/src/learn_environment/src/script_execution/CMakeLists.txt b/catkin_ws/src/learn_environment/src/script_execution/CMakeLists.txt
new file mode 100644
index 0000000..f862257
--- /dev/null
+++ b/catkin_ws/src/learn_environment/src/script_execution/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_library(script_execution
+    process_runner.cpp
+    script_worker.cpp
+    task_executor.cpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/script_execution/process_runner.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/script_execution/script_worker.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/script_execution/task_executor.hpp
+)
+
+target_include_directories(script_execution PUBLIC 
+    ${CMAKE_SOURCE_DIR}/include/script_execution
+)
+
+target_link_libraries(script_execution
+    common
+    Qt5::Core
+    Qt5::Widgets
+    ${QT_LIBRARIES}
+    ${catkin_LIBRARIES}
+)
\ No newline at end of file
diff --git a/catkin_ws/src/learn_environment/src/process_runner.cpp b/catkin_ws/src/learn_environment/src/script_execution/process_runner.cpp
similarity index 98%
rename from catkin_ws/src/learn_environment/src/process_runner.cpp
rename to catkin_ws/src/learn_environment/src/script_execution/process_runner.cpp
index 2559ccd..df89ce6 100644
--- a/catkin_ws/src/learn_environment/src/process_runner.cpp
+++ b/catkin_ws/src/learn_environment/src/script_execution/process_runner.cpp
@@ -1,4 +1,4 @@
-#include "learn_environment/process_runner.hpp"
+#include "script_execution/process_runner.hpp"
 
 #include <QDebug>
 #include <QRegularExpression>
diff --git a/catkin_ws/src/learn_environment/src/script_worker.cpp b/catkin_ws/src/learn_environment/src/script_execution/script_worker.cpp
similarity index 99%
rename from catkin_ws/src/learn_environment/src/script_worker.cpp
rename to catkin_ws/src/learn_environment/src/script_execution/script_worker.cpp
index 2da58ac..684ec08 100644
--- a/catkin_ws/src/learn_environment/src/script_worker.cpp
+++ b/catkin_ws/src/learn_environment/src/script_execution/script_worker.cpp
@@ -1,5 +1,5 @@
-#include "learn_environment/script_worker.hpp"
-#include "learn_environment/process_runner.hpp"
+#include "script_execution/script_worker.hpp"
+#include "script_execution/process_runner.hpp"
 
 #include <QDebug>
 #include <QFile>
diff --git a/catkin_ws/src/learn_environment/src/task_executor.cpp b/catkin_ws/src/learn_environment/src/script_execution/task_executor.cpp
similarity index 96%
rename from catkin_ws/src/learn_environment/src/task_executor.cpp
rename to catkin_ws/src/learn_environment/src/script_execution/task_executor.cpp
index af4ef31..8e508f3 100644
--- a/catkin_ws/src/learn_environment/src/task_executor.cpp
+++ b/catkin_ws/src/learn_environment/src/script_execution/task_executor.cpp
@@ -1,6 +1,6 @@
-#include "learn_environment/task_executor.hpp"
-#include "learn_environment/script_worker.hpp"
-#include "learn_environment/folder_structure_constants.hpp"
+#include "script_execution/task_executor.hpp"
+#include "script_execution/script_worker.hpp"
+#include "common/folder_structure_constants.hpp"
 
 #include <QThread>
 #include <QFile>
diff --git a/catkin_ws/src/learn_environment/src/task_management/CMakeLists.txt b/catkin_ws/src/learn_environment/src/task_management/CMakeLists.txt
new file mode 100644
index 0000000..c6e856d
--- /dev/null
+++ b/catkin_ws/src/learn_environment/src/task_management/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_library(task_management
+    task_manager.cpp
+    task_parser.cpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/task_management/task_manager.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/task_management/task_parser.hpp
+)
+
+target_include_directories(task_management PUBLIC 
+    ${CMAKE_SOURCE_DIR}/include
+)
+
+target_link_libraries(task_management
+    common
+    script_execution
+    ui
+    Qt5::Core
+    Qt5::Widgets
+    ${QT_LIBRARIES}
+    ${catkin_LIBRARIES}
+)
\ No newline at end of file
diff --git a/catkin_ws/src/learn_environment/src/task_manager.cpp b/catkin_ws/src/learn_environment/src/task_management/task_manager.cpp
similarity index 97%
rename from catkin_ws/src/learn_environment/src/task_manager.cpp
rename to catkin_ws/src/learn_environment/src/task_management/task_manager.cpp
index 8ab2e9d..a79afd3 100644
--- a/catkin_ws/src/learn_environment/src/task_manager.cpp
+++ b/catkin_ws/src/learn_environment/src/task_management/task_manager.cpp
@@ -1,9 +1,9 @@
-#include "learn_environment/task_manager.hpp"
-#include "learn_environment/task_ui.hpp"
-#include "learn_environment/task_parser.hpp"
-#include "learn_environment/task_executor.hpp"
-#include "learn_environment/notebook_converter.hpp"
-#include "learn_environment/folder_structure_constants.hpp"
+#include "task_management/task_manager.hpp"
+#include "ui/task_ui.hpp"
+#include "task_management/task_parser.hpp"
+#include "script_execution/task_executor.hpp"
+#include "common/notebook_converter.hpp"
+#include "common/folder_structure_constants.hpp"
 
 #include <QDebug>
 #include <QToolButton>
diff --git a/catkin_ws/src/learn_environment/src/task_parser.cpp b/catkin_ws/src/learn_environment/src/task_management/task_parser.cpp
similarity index 98%
rename from catkin_ws/src/learn_environment/src/task_parser.cpp
rename to catkin_ws/src/learn_environment/src/task_management/task_parser.cpp
index bc95523..7bec70c 100644
--- a/catkin_ws/src/learn_environment/src/task_parser.cpp
+++ b/catkin_ws/src/learn_environment/src/task_management/task_parser.cpp
@@ -1,5 +1,5 @@
-#include "learn_environment/task_parser.hpp"
-#include "learn_environment/folder_structure_constants.hpp"
+#include "task_management/task_parser.hpp"
+#include "common/folder_structure_constants.hpp"
 
 #include <QFile>
 #include <QTextStream>
diff --git a/catkin_ws/src/learn_environment/src/ui/CMakeLists.txt b/catkin_ws/src/learn_environment/src/ui/CMakeLists.txt
new file mode 100644
index 0000000..6cd223b
--- /dev/null
+++ b/catkin_ws/src/learn_environment/src/ui/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_library(ui
+    custom_list_widget.cpp
+    execute_frame.cpp
+    sidebar.cpp
+    subtask_item.cpp
+    task_ui.cpp
+    toast.cpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/ui/custom_list_widget.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/ui/execute_frame.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/ui/sidebar.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/ui/subtask_item.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/ui/task_ui.hpp
+    ${CMAKE_SOURCE_DIR}/learn_environment/include/ui/toast.hpp
+)
+
+target_include_directories(ui PUBLIC ${CMAKE_SOURCE_DIR}/include/ui)
+
+target_link_libraries(ui
+    common
+    Qt5::Core
+    Qt5::Widgets
+    ${QT_LIBRARIES}
+    ${catkin_LIBRARIES}
+)
\ No newline at end of file
diff --git a/catkin_ws/src/learn_environment/src/custom_list_widget.cpp b/catkin_ws/src/learn_environment/src/ui/custom_list_widget.cpp
similarity index 97%
rename from catkin_ws/src/learn_environment/src/custom_list_widget.cpp
rename to catkin_ws/src/learn_environment/src/ui/custom_list_widget.cpp
index 41bdf8b..9cea67f 100644
--- a/catkin_ws/src/learn_environment/src/custom_list_widget.cpp
+++ b/catkin_ws/src/learn_environment/src/ui/custom_list_widget.cpp
@@ -1,4 +1,4 @@
-#include "learn_environment/custom_list_widget.hpp"
+#include "ui/custom_list_widget.hpp"
 
 CustomListWidget::CustomListWidget(QWidget *parent)
     : QListWidget(parent) {
diff --git a/catkin_ws/src/learn_environment/src/execute_frame.cpp b/catkin_ws/src/learn_environment/src/ui/execute_frame.cpp
similarity index 98%
rename from catkin_ws/src/learn_environment/src/execute_frame.cpp
rename to catkin_ws/src/learn_environment/src/ui/execute_frame.cpp
index 6c39ca2..2d8899f 100644
--- a/catkin_ws/src/learn_environment/src/execute_frame.cpp
+++ b/catkin_ws/src/learn_environment/src/ui/execute_frame.cpp
@@ -1,4 +1,4 @@
-#include "learn_environment/execute_frame.hpp"
+#include "ui/execute_frame.hpp"
 #include <QDebug>
 #include <QSize>
 
diff --git a/catkin_ws/src/learn_environment/src/sidebar.cpp b/catkin_ws/src/learn_environment/src/ui/sidebar.cpp
similarity index 96%
rename from catkin_ws/src/learn_environment/src/sidebar.cpp
rename to catkin_ws/src/learn_environment/src/ui/sidebar.cpp
index 7ea327a..340de09 100644
--- a/catkin_ws/src/learn_environment/src/sidebar.cpp
+++ b/catkin_ws/src/learn_environment/src/ui/sidebar.cpp
@@ -1,6 +1,6 @@
-#include "learn_environment/sidebar.hpp"
-#include "learn_environment/custom_list_widget.hpp"
-#include "learn_environment/task.hpp"
+#include "ui/sidebar.hpp"
+#include "ui/custom_list_widget.hpp"
+#include "common/task.hpp"
 
 #include <QFont>
 #include <QDebug>
diff --git a/catkin_ws/src/learn_environment/src/subtask_item.cpp b/catkin_ws/src/learn_environment/src/ui/subtask_item.cpp
similarity index 99%
rename from catkin_ws/src/learn_environment/src/subtask_item.cpp
rename to catkin_ws/src/learn_environment/src/ui/subtask_item.cpp
index 287af31..0e46722 100644
--- a/catkin_ws/src/learn_environment/src/subtask_item.cpp
+++ b/catkin_ws/src/learn_environment/src/ui/subtask_item.cpp
@@ -1,6 +1,6 @@
-#include "learn_environment/subtask_item.hpp"
-#include "learn_environment/task_manager.hpp"
-#include "learn_environment/notebook_converter.hpp"
+#include "ui/subtask_item.hpp"
+#include "task_management/task_manager.hpp"
+#include "common/notebook_converter.hpp"
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
diff --git a/catkin_ws/src/learn_environment/src/task_ui.cpp b/catkin_ws/src/learn_environment/src/ui/task_ui.cpp
similarity index 99%
rename from catkin_ws/src/learn_environment/src/task_ui.cpp
rename to catkin_ws/src/learn_environment/src/ui/task_ui.cpp
index 26375ed..7230d00 100644
--- a/catkin_ws/src/learn_environment/src/task_ui.cpp
+++ b/catkin_ws/src/learn_environment/src/ui/task_ui.cpp
@@ -1,5 +1,5 @@
-#include "learn_environment/task_ui.hpp"
-#include "learn_environment/subtask_item.hpp"
+#include "ui/task_ui.hpp"
+#include "ui/subtask_item.hpp"
 
 #include <QRegExp>
 #include <QSplitter>
diff --git a/catkin_ws/src/learn_environment/src/toast.cpp b/catkin_ws/src/learn_environment/src/ui/toast.cpp
similarity index 98%
rename from catkin_ws/src/learn_environment/src/toast.cpp
rename to catkin_ws/src/learn_environment/src/ui/toast.cpp
index 54ef293..543aae4 100644
--- a/catkin_ws/src/learn_environment/src/toast.cpp
+++ b/catkin_ws/src/learn_environment/src/ui/toast.cpp
@@ -1,4 +1,4 @@
-#include "learn_environment/toast.hpp"
+#include "ui/toast.hpp"
 
 #include <QGraphicsOpacityEffect>
 #include <QPropertyAnimation>
-- 
GitLab