diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86699a0a7fec579763eed3aabbbe5af6cd154371..e9a6409898deca8273b055822e75008ef62a6b54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,10 +9,15 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-# add sog
-set(SOG_DIR "${CMAKE_SOURCE_DIR}/libs/sog")
-message(STATUS "Building SOG ...")
-add_subdirectory(${SOG_DIR})
+# add BuDDy
+set(BUDDY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs/buddy")
+message(STATUS "Building BuDDy parser ...")
+add_subdirectory(${BUDDY_DIR})
+
+# add pn parser
+set(PARSER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libs/parser")
+message(STATUS "Building Petri Net parser ...")
+add_subdirectory(${PARSER_DIR})
 
 # add source folder
 include_directories(src)
diff --git a/libs/sog/CMakeLists.txt b/libs/sog/CMakeLists.txt
deleted file mode 100644
index de31a980b75a43fea4fe01ea59b6b248655f3ed5..0000000000000000000000000000000000000000
--- a/libs/sog/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# set minimum cmake version
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-# project name and language
-project(sog LANGUAGES CXX)
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-# variables
-set(SRC_DIR "${PROJECT_SOURCE_DIR}/src")
-
-# add BuDDy
-set(BUDDY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../buddy")
-message(STATUS "Building BuDDy parser ...")
-add_subdirectory(${BUDDY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/libs/buddy")
-
-# add pn parser
-set(PARSER_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../parser")
-message(STATUS "Building Petri Net parser ...")
-add_subdirectory(${PARSER_DIR} "${CMAKE_CURRENT_BINARY_DIR}/libs/parser")
-
-# add source folder
-include_directories(${SRC_DIR})
-add_subdirectory(src)
diff --git a/libs/sog/src/CMakeLists.txt b/libs/sog/src/CMakeLists.txt
deleted file mode 100644
index 08f148b6cee4e735374fac2f66badd16bb23858b..0000000000000000000000000000000000000000
--- a/libs/sog/src/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# set minimum cmake version
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-
-# compilator flags
-project(sog-src LANGUAGES CXX)
-
-# generate the library from sources
-add_library(sog STATIC
-  MDGraph.cpp
-  RdPBDD.cpp
-  Modular_Obs_Graph.cpp
-)
-
-target_include_directories(sog PRIVATE "${BUDDY_DIR}/src" "${PARSER_DIR}/src")
-target_link_libraries(sog RdP bdd)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a05e3c900790db2270b9e038b34a4143c03271ed..735ccd4547d9b097192331ad4efd126c2c57f294 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,11 @@
 # set minimum cmake version
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
-add_executable(sogMBT main.cpp)
+add_executable(sogMBT main.cpp
+  MDGraph.cpp
+  RdPBDD.cpp
+  Modular_Obs_Graph.cpp
+)
 
-target_include_directories(sogMBT PRIVATE
-  "${PROJECT_SOURCE_DIR}/libs/buddy/src"
-  "${PROJECT_SOURCE_DIR}/libs/parser/src"
-  "${PROJECT_SOURCE_DIR}/libs/sog/src")
-target_link_libraries(sogMBT bdd RdP sog)
\ No newline at end of file
+target_include_directories(sogMBT PRIVATE "${BUDDY_DIR}/src" "${PARSER_DIR}/src")
+target_link_libraries(sogMBT bdd RdP)
\ No newline at end of file
diff --git a/libs/sog/src/Class_of_state.hpp b/src/Class_of_state.hpp
similarity index 100%
rename from libs/sog/src/Class_of_state.hpp
rename to src/Class_of_state.hpp
diff --git a/libs/sog/src/MDGraph.cpp b/src/MDGraph.cpp
similarity index 100%
rename from libs/sog/src/MDGraph.cpp
rename to src/MDGraph.cpp
diff --git a/libs/sog/src/MDGraph.hpp b/src/MDGraph.hpp
similarity index 100%
rename from libs/sog/src/MDGraph.hpp
rename to src/MDGraph.hpp
diff --git a/libs/sog/src/Modular_Class_of_state.hpp b/src/Modular_Class_of_state.hpp
similarity index 100%
rename from libs/sog/src/Modular_Class_of_state.hpp
rename to src/Modular_Class_of_state.hpp
diff --git a/libs/sog/src/Modular_Obs_Graph.cpp b/src/Modular_Obs_Graph.cpp
similarity index 100%
rename from libs/sog/src/Modular_Obs_Graph.cpp
rename to src/Modular_Obs_Graph.cpp
diff --git a/libs/sog/src/Modular_Obs_Graph.hpp b/src/Modular_Obs_Graph.hpp
similarity index 100%
rename from libs/sog/src/Modular_Obs_Graph.hpp
rename to src/Modular_Obs_Graph.hpp
diff --git a/libs/sog/src/RdPBDD.cpp b/src/RdPBDD.cpp
similarity index 100%
rename from libs/sog/src/RdPBDD.cpp
rename to src/RdPBDD.cpp
diff --git a/libs/sog/src/RdPBDD.hpp b/src/RdPBDD.hpp
similarity index 100%
rename from libs/sog/src/RdPBDD.hpp
rename to src/RdPBDD.hpp