diff --git a/.gitignore b/.gitignore
index 4e893b19008341e8ca4adeab6046200750a0381e..3b5ca2525e43465420a539172920d218aa2b07d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,4 +85,23 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
+
+### CMake ###
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+### CMake Patch ###
+# External projects
+*-prefix/
+
+**/build
 # End of https://www.toptal.com/developers/gitignore/api/c++,visualstudiocode
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50c70c67c5dfb52283b4b518d89180ffea7f646d..86699a0a7fec579763eed3aabbbe5af6cd154371 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 # add sog
-set(SOG_DIR "${CMAKE_SOURCE_DIR}/lib/sog")
+set(SOG_DIR "${CMAKE_SOURCE_DIR}/libs/sog")
 message(STATUS "Building SOG ...")
 add_subdirectory(${SOG_DIR})
 
diff --git a/lib/buddy/AUTHORS b/libs/buddy/AUTHORS
similarity index 100%
rename from lib/buddy/AUTHORS
rename to libs/buddy/AUTHORS
diff --git a/lib/buddy/CHANGES b/libs/buddy/CHANGES
similarity index 100%
rename from lib/buddy/CHANGES
rename to libs/buddy/CHANGES
diff --git a/lib/buddy/CMakeLists.txt b/libs/buddy/CMakeLists.txt
similarity index 100%
rename from lib/buddy/CMakeLists.txt
rename to libs/buddy/CMakeLists.txt
diff --git a/lib/buddy/ChangeLog b/libs/buddy/ChangeLog
similarity index 100%
rename from lib/buddy/ChangeLog
rename to libs/buddy/ChangeLog
diff --git a/lib/buddy/LICENSE.md b/libs/buddy/LICENSE.md
similarity index 100%
rename from lib/buddy/LICENSE.md
rename to libs/buddy/LICENSE.md
diff --git a/lib/buddy/Makefile.am b/libs/buddy/Makefile.am
similarity index 100%
rename from lib/buddy/Makefile.am
rename to libs/buddy/Makefile.am
diff --git a/lib/buddy/Makefile.in b/libs/buddy/Makefile.in
similarity index 100%
rename from lib/buddy/Makefile.in
rename to libs/buddy/Makefile.in
diff --git a/lib/buddy/NEWS b/libs/buddy/NEWS
similarity index 100%
rename from lib/buddy/NEWS
rename to libs/buddy/NEWS
diff --git a/lib/buddy/README.md b/libs/buddy/README.md
similarity index 100%
rename from lib/buddy/README.md
rename to libs/buddy/README.md
diff --git a/lib/buddy/aclocal.m4 b/libs/buddy/aclocal.m4
similarity index 100%
rename from lib/buddy/aclocal.m4
rename to libs/buddy/aclocal.m4
diff --git a/lib/buddy/config.h.in b/libs/buddy/config.h.in
similarity index 100%
rename from lib/buddy/config.h.in
rename to libs/buddy/config.h.in
diff --git a/lib/buddy/configure b/libs/buddy/configure
similarity index 100%
rename from lib/buddy/configure
rename to libs/buddy/configure
diff --git a/lib/buddy/configure.ac b/libs/buddy/configure.ac
similarity index 100%
rename from lib/buddy/configure.ac
rename to libs/buddy/configure.ac
diff --git a/lib/buddy/doc/Makefile.am b/libs/buddy/doc/Makefile.am
similarity index 100%
rename from lib/buddy/doc/Makefile.am
rename to libs/buddy/doc/Makefile.am
diff --git a/lib/buddy/doc/Makefile.in b/libs/buddy/doc/Makefile.in
similarity index 100%
rename from lib/buddy/doc/Makefile.in
rename to libs/buddy/doc/Makefile.in
diff --git a/lib/buddy/doc/bddnotes.ps b/libs/buddy/doc/bddnotes.ps
similarity index 100%
rename from lib/buddy/doc/bddnotes.ps
rename to libs/buddy/doc/bddnotes.ps
diff --git a/lib/buddy/doc/buddy.ps b/libs/buddy/doc/buddy.ps
similarity index 100%
rename from lib/buddy/doc/buddy.ps
rename to libs/buddy/doc/buddy.ps
diff --git a/lib/buddy/doc/tech.txt b/libs/buddy/doc/tech.txt
similarity index 100%
rename from lib/buddy/doc/tech.txt
rename to libs/buddy/doc/tech.txt
diff --git a/lib/buddy/examples/CMakeLists.txt b/libs/buddy/examples/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/CMakeLists.txt
rename to libs/buddy/examples/CMakeLists.txt
diff --git a/lib/buddy/examples/Makefile.am b/libs/buddy/examples/Makefile.am
similarity index 100%
rename from lib/buddy/examples/Makefile.am
rename to libs/buddy/examples/Makefile.am
diff --git a/lib/buddy/examples/Makefile.def b/libs/buddy/examples/Makefile.def
similarity index 100%
rename from lib/buddy/examples/Makefile.def
rename to libs/buddy/examples/Makefile.def
diff --git a/lib/buddy/examples/Makefile.in b/libs/buddy/examples/Makefile.in
similarity index 100%
rename from lib/buddy/examples/Makefile.in
rename to libs/buddy/examples/Makefile.in
diff --git a/lib/buddy/examples/adder/CMakeLists.txt b/libs/buddy/examples/adder/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/adder/CMakeLists.txt
rename to libs/buddy/examples/adder/CMakeLists.txt
diff --git a/lib/buddy/examples/adder/Makefile.am b/libs/buddy/examples/adder/Makefile.am
similarity index 100%
rename from lib/buddy/examples/adder/Makefile.am
rename to libs/buddy/examples/adder/Makefile.am
diff --git a/lib/buddy/examples/adder/Makefile.in b/libs/buddy/examples/adder/Makefile.in
similarity index 100%
rename from lib/buddy/examples/adder/Makefile.in
rename to libs/buddy/examples/adder/Makefile.in
diff --git a/lib/buddy/examples/adder/adder.cxx b/libs/buddy/examples/adder/adder.cxx
similarity index 100%
rename from lib/buddy/examples/adder/adder.cxx
rename to libs/buddy/examples/adder/adder.cxx
diff --git a/lib/buddy/examples/adder/expected b/libs/buddy/examples/adder/expected
similarity index 100%
rename from lib/buddy/examples/adder/expected
rename to libs/buddy/examples/adder/expected
diff --git a/lib/buddy/examples/adder/runtest b/libs/buddy/examples/adder/runtest
similarity index 100%
rename from lib/buddy/examples/adder/runtest
rename to libs/buddy/examples/adder/runtest
diff --git a/lib/buddy/examples/bddcalc/CMakeLists.txt b/libs/buddy/examples/bddcalc/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/bddcalc/CMakeLists.txt
rename to libs/buddy/examples/bddcalc/CMakeLists.txt
diff --git a/lib/buddy/examples/bddcalc/Makefile.am b/libs/buddy/examples/bddcalc/Makefile.am
similarity index 100%
rename from lib/buddy/examples/bddcalc/Makefile.am
rename to libs/buddy/examples/bddcalc/Makefile.am
diff --git a/lib/buddy/examples/bddcalc/Makefile.in b/libs/buddy/examples/bddcalc/Makefile.in
similarity index 100%
rename from lib/buddy/examples/bddcalc/Makefile.in
rename to libs/buddy/examples/bddcalc/Makefile.in
diff --git a/lib/buddy/examples/bddcalc/example.cal b/libs/buddy/examples/bddcalc/example.cal
similarity index 100%
rename from lib/buddy/examples/bddcalc/example.cal
rename to libs/buddy/examples/bddcalc/example.cal
diff --git a/lib/buddy/examples/bddcalc/examples/c1355.cal b/libs/buddy/examples/bddcalc/examples/c1355.cal
similarity index 100%
rename from lib/buddy/examples/bddcalc/examples/c1355.cal
rename to libs/buddy/examples/bddcalc/examples/c1355.cal
diff --git a/lib/buddy/examples/bddcalc/examples/c1908.cal b/libs/buddy/examples/bddcalc/examples/c1908.cal
similarity index 100%
rename from lib/buddy/examples/bddcalc/examples/c1908.cal
rename to libs/buddy/examples/bddcalc/examples/c1908.cal
diff --git a/lib/buddy/examples/bddcalc/examples/c2670.cal b/libs/buddy/examples/bddcalc/examples/c2670.cal
similarity index 100%
rename from lib/buddy/examples/bddcalc/examples/c2670.cal
rename to libs/buddy/examples/bddcalc/examples/c2670.cal
diff --git a/lib/buddy/examples/bddcalc/examples/c3540.cal b/libs/buddy/examples/bddcalc/examples/c3540.cal
similarity index 100%
rename from lib/buddy/examples/bddcalc/examples/c3540.cal
rename to libs/buddy/examples/bddcalc/examples/c3540.cal
diff --git a/lib/buddy/examples/bddcalc/examples/c432.cal b/libs/buddy/examples/bddcalc/examples/c432.cal
similarity index 100%
rename from lib/buddy/examples/bddcalc/examples/c432.cal
rename to libs/buddy/examples/bddcalc/examples/c432.cal
diff --git a/lib/buddy/examples/bddcalc/examples/c499.cal b/libs/buddy/examples/bddcalc/examples/c499.cal
similarity index 100%
rename from lib/buddy/examples/bddcalc/examples/c499.cal
rename to libs/buddy/examples/bddcalc/examples/c499.cal
diff --git a/lib/buddy/examples/bddcalc/examples/readme b/libs/buddy/examples/bddcalc/examples/readme
similarity index 100%
rename from lib/buddy/examples/bddcalc/examples/readme
rename to libs/buddy/examples/bddcalc/examples/readme
diff --git a/lib/buddy/examples/bddcalc/expected b/libs/buddy/examples/bddcalc/expected
similarity index 100%
rename from lib/buddy/examples/bddcalc/expected
rename to libs/buddy/examples/bddcalc/expected
diff --git a/lib/buddy/examples/bddcalc/hashtbl.cxx b/libs/buddy/examples/bddcalc/hashtbl.cxx
similarity index 100%
rename from lib/buddy/examples/bddcalc/hashtbl.cxx
rename to libs/buddy/examples/bddcalc/hashtbl.cxx
diff --git a/lib/buddy/examples/bddcalc/hashtbl.h b/libs/buddy/examples/bddcalc/hashtbl.h
similarity index 100%
rename from lib/buddy/examples/bddcalc/hashtbl.h
rename to libs/buddy/examples/bddcalc/hashtbl.h
diff --git a/lib/buddy/examples/bddcalc/lexer.cxx b/libs/buddy/examples/bddcalc/lexer.cxx
similarity index 100%
rename from lib/buddy/examples/bddcalc/lexer.cxx
rename to libs/buddy/examples/bddcalc/lexer.cxx
diff --git a/lib/buddy/examples/bddcalc/lexer.lxx b/libs/buddy/examples/bddcalc/lexer.lxx
similarity index 100%
rename from lib/buddy/examples/bddcalc/lexer.lxx
rename to libs/buddy/examples/bddcalc/lexer.lxx
diff --git a/lib/buddy/examples/bddcalc/parser.cxx b/libs/buddy/examples/bddcalc/parser.cxx
similarity index 100%
rename from lib/buddy/examples/bddcalc/parser.cxx
rename to libs/buddy/examples/bddcalc/parser.cxx
diff --git a/lib/buddy/examples/bddcalc/parser.h b/libs/buddy/examples/bddcalc/parser.h
similarity index 100%
rename from lib/buddy/examples/bddcalc/parser.h
rename to libs/buddy/examples/bddcalc/parser.h
diff --git a/lib/buddy/examples/bddcalc/parser.yxx b/libs/buddy/examples/bddcalc/parser.yxx
similarity index 100%
rename from lib/buddy/examples/bddcalc/parser.yxx
rename to libs/buddy/examples/bddcalc/parser.yxx
diff --git a/lib/buddy/examples/bddcalc/parser_.h b/libs/buddy/examples/bddcalc/parser_.h
similarity index 100%
rename from lib/buddy/examples/bddcalc/parser_.h
rename to libs/buddy/examples/bddcalc/parser_.h
diff --git a/lib/buddy/examples/bddcalc/readme b/libs/buddy/examples/bddcalc/readme
similarity index 100%
rename from lib/buddy/examples/bddcalc/readme
rename to libs/buddy/examples/bddcalc/readme
diff --git a/lib/buddy/examples/bddcalc/runtest b/libs/buddy/examples/bddcalc/runtest
similarity index 100%
rename from lib/buddy/examples/bddcalc/runtest
rename to libs/buddy/examples/bddcalc/runtest
diff --git a/lib/buddy/examples/bddcalc/slist.h b/libs/buddy/examples/bddcalc/slist.h
similarity index 100%
rename from lib/buddy/examples/bddcalc/slist.h
rename to libs/buddy/examples/bddcalc/slist.h
diff --git a/lib/buddy/examples/bddtest/CMakeLists.txt b/libs/buddy/examples/bddtest/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/bddtest/CMakeLists.txt
rename to libs/buddy/examples/bddtest/CMakeLists.txt
diff --git a/lib/buddy/examples/bddtest/Makefile.am b/libs/buddy/examples/bddtest/Makefile.am
similarity index 100%
rename from lib/buddy/examples/bddtest/Makefile.am
rename to libs/buddy/examples/bddtest/Makefile.am
diff --git a/lib/buddy/examples/bddtest/Makefile.in b/libs/buddy/examples/bddtest/Makefile.in
similarity index 100%
rename from lib/buddy/examples/bddtest/Makefile.in
rename to libs/buddy/examples/bddtest/Makefile.in
diff --git a/lib/buddy/examples/bddtest/bddtest.cxx b/libs/buddy/examples/bddtest/bddtest.cxx
similarity index 100%
rename from lib/buddy/examples/bddtest/bddtest.cxx
rename to libs/buddy/examples/bddtest/bddtest.cxx
diff --git a/lib/buddy/examples/bddtest/expected b/libs/buddy/examples/bddtest/expected
similarity index 100%
rename from lib/buddy/examples/bddtest/expected
rename to libs/buddy/examples/bddtest/expected
diff --git a/lib/buddy/examples/bddtest/runtest b/libs/buddy/examples/bddtest/runtest
similarity index 100%
rename from lib/buddy/examples/bddtest/runtest
rename to libs/buddy/examples/bddtest/runtest
diff --git a/lib/buddy/examples/cmilner/CMakeLists.txt b/libs/buddy/examples/cmilner/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/cmilner/CMakeLists.txt
rename to libs/buddy/examples/cmilner/CMakeLists.txt
diff --git a/lib/buddy/examples/cmilner/Makefile.am b/libs/buddy/examples/cmilner/Makefile.am
similarity index 100%
rename from lib/buddy/examples/cmilner/Makefile.am
rename to libs/buddy/examples/cmilner/Makefile.am
diff --git a/lib/buddy/examples/cmilner/Makefile.in b/libs/buddy/examples/cmilner/Makefile.in
similarity index 100%
rename from lib/buddy/examples/cmilner/Makefile.in
rename to libs/buddy/examples/cmilner/Makefile.in
diff --git a/lib/buddy/examples/cmilner/cmilner.c b/libs/buddy/examples/cmilner/cmilner.c
similarity index 100%
rename from lib/buddy/examples/cmilner/cmilner.c
rename to libs/buddy/examples/cmilner/cmilner.c
diff --git a/lib/buddy/examples/cmilner/expected b/libs/buddy/examples/cmilner/expected
similarity index 100%
rename from lib/buddy/examples/cmilner/expected
rename to libs/buddy/examples/cmilner/expected
diff --git a/lib/buddy/examples/cmilner/readme b/libs/buddy/examples/cmilner/readme
similarity index 100%
rename from lib/buddy/examples/cmilner/readme
rename to libs/buddy/examples/cmilner/readme
diff --git a/lib/buddy/examples/cmilner/runtest b/libs/buddy/examples/cmilner/runtest
similarity index 100%
rename from lib/buddy/examples/cmilner/runtest
rename to libs/buddy/examples/cmilner/runtest
diff --git a/lib/buddy/examples/fdd/CMakeLists.txt b/libs/buddy/examples/fdd/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/fdd/CMakeLists.txt
rename to libs/buddy/examples/fdd/CMakeLists.txt
diff --git a/lib/buddy/examples/fdd/Makefile.am b/libs/buddy/examples/fdd/Makefile.am
similarity index 100%
rename from lib/buddy/examples/fdd/Makefile.am
rename to libs/buddy/examples/fdd/Makefile.am
diff --git a/lib/buddy/examples/fdd/Makefile.in b/libs/buddy/examples/fdd/Makefile.in
similarity index 100%
rename from lib/buddy/examples/fdd/Makefile.in
rename to libs/buddy/examples/fdd/Makefile.in
diff --git a/lib/buddy/examples/fdd/expected b/libs/buddy/examples/fdd/expected
similarity index 100%
rename from lib/buddy/examples/fdd/expected
rename to libs/buddy/examples/fdd/expected
diff --git a/lib/buddy/examples/fdd/fdd.cxx b/libs/buddy/examples/fdd/fdd.cxx
similarity index 100%
rename from lib/buddy/examples/fdd/fdd.cxx
rename to libs/buddy/examples/fdd/fdd.cxx
diff --git a/lib/buddy/examples/fdd/runtest b/libs/buddy/examples/fdd/runtest
similarity index 100%
rename from lib/buddy/examples/fdd/runtest
rename to libs/buddy/examples/fdd/runtest
diff --git a/lib/buddy/examples/milner/CMakeLists.txt b/libs/buddy/examples/milner/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/milner/CMakeLists.txt
rename to libs/buddy/examples/milner/CMakeLists.txt
diff --git a/lib/buddy/examples/milner/Makefile.am b/libs/buddy/examples/milner/Makefile.am
similarity index 100%
rename from lib/buddy/examples/milner/Makefile.am
rename to libs/buddy/examples/milner/Makefile.am
diff --git a/lib/buddy/examples/milner/Makefile.in b/libs/buddy/examples/milner/Makefile.in
similarity index 100%
rename from lib/buddy/examples/milner/Makefile.in
rename to libs/buddy/examples/milner/Makefile.in
diff --git a/lib/buddy/examples/milner/expected b/libs/buddy/examples/milner/expected
similarity index 100%
rename from lib/buddy/examples/milner/expected
rename to libs/buddy/examples/milner/expected
diff --git a/lib/buddy/examples/milner/milner.cxx b/libs/buddy/examples/milner/milner.cxx
similarity index 100%
rename from lib/buddy/examples/milner/milner.cxx
rename to libs/buddy/examples/milner/milner.cxx
diff --git a/lib/buddy/examples/milner/readme b/libs/buddy/examples/milner/readme
similarity index 100%
rename from lib/buddy/examples/milner/readme
rename to libs/buddy/examples/milner/readme
diff --git a/lib/buddy/examples/milner/runtest b/libs/buddy/examples/milner/runtest
similarity index 100%
rename from lib/buddy/examples/milner/runtest
rename to libs/buddy/examples/milner/runtest
diff --git a/lib/buddy/examples/money/CMakeLists.txt b/libs/buddy/examples/money/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/money/CMakeLists.txt
rename to libs/buddy/examples/money/CMakeLists.txt
diff --git a/lib/buddy/examples/money/Makefile.am b/libs/buddy/examples/money/Makefile.am
similarity index 100%
rename from lib/buddy/examples/money/Makefile.am
rename to libs/buddy/examples/money/Makefile.am
diff --git a/lib/buddy/examples/money/Makefile.in b/libs/buddy/examples/money/Makefile.in
similarity index 100%
rename from lib/buddy/examples/money/Makefile.in
rename to libs/buddy/examples/money/Makefile.in
diff --git a/lib/buddy/examples/money/expected b/libs/buddy/examples/money/expected
similarity index 100%
rename from lib/buddy/examples/money/expected
rename to libs/buddy/examples/money/expected
diff --git a/lib/buddy/examples/money/money.cxx b/libs/buddy/examples/money/money.cxx
similarity index 100%
rename from lib/buddy/examples/money/money.cxx
rename to libs/buddy/examples/money/money.cxx
diff --git a/lib/buddy/examples/money/runtest b/libs/buddy/examples/money/runtest
similarity index 100%
rename from lib/buddy/examples/money/runtest
rename to libs/buddy/examples/money/runtest
diff --git a/lib/buddy/examples/queen/CMakeLists.txt b/libs/buddy/examples/queen/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/queen/CMakeLists.txt
rename to libs/buddy/examples/queen/CMakeLists.txt
diff --git a/lib/buddy/examples/queen/Makefile.am b/libs/buddy/examples/queen/Makefile.am
similarity index 100%
rename from lib/buddy/examples/queen/Makefile.am
rename to libs/buddy/examples/queen/Makefile.am
diff --git a/lib/buddy/examples/queen/Makefile.in b/libs/buddy/examples/queen/Makefile.in
similarity index 100%
rename from lib/buddy/examples/queen/Makefile.in
rename to libs/buddy/examples/queen/Makefile.in
diff --git a/lib/buddy/examples/queen/expected b/libs/buddy/examples/queen/expected
similarity index 100%
rename from lib/buddy/examples/queen/expected
rename to libs/buddy/examples/queen/expected
diff --git a/lib/buddy/examples/queen/queen.cxx b/libs/buddy/examples/queen/queen.cxx
similarity index 100%
rename from lib/buddy/examples/queen/queen.cxx
rename to libs/buddy/examples/queen/queen.cxx
diff --git a/lib/buddy/examples/queen/runtest b/libs/buddy/examples/queen/runtest
similarity index 100%
rename from lib/buddy/examples/queen/runtest
rename to libs/buddy/examples/queen/runtest
diff --git a/lib/buddy/examples/runregression b/libs/buddy/examples/runregression
similarity index 100%
rename from lib/buddy/examples/runregression
rename to libs/buddy/examples/runregression
diff --git a/lib/buddy/examples/solitare/CMakeLists.txt b/libs/buddy/examples/solitare/CMakeLists.txt
similarity index 100%
rename from lib/buddy/examples/solitare/CMakeLists.txt
rename to libs/buddy/examples/solitare/CMakeLists.txt
diff --git a/lib/buddy/examples/solitare/Makefile.am b/libs/buddy/examples/solitare/Makefile.am
similarity index 100%
rename from lib/buddy/examples/solitare/Makefile.am
rename to libs/buddy/examples/solitare/Makefile.am
diff --git a/lib/buddy/examples/solitare/Makefile.in b/libs/buddy/examples/solitare/Makefile.in
similarity index 100%
rename from lib/buddy/examples/solitare/Makefile.in
rename to libs/buddy/examples/solitare/Makefile.in
diff --git a/lib/buddy/examples/solitare/readme b/libs/buddy/examples/solitare/readme
similarity index 100%
rename from lib/buddy/examples/solitare/readme
rename to libs/buddy/examples/solitare/readme
diff --git a/lib/buddy/examples/solitare/solitare.cxx b/libs/buddy/examples/solitare/solitare.cxx
similarity index 100%
rename from lib/buddy/examples/solitare/solitare.cxx
rename to libs/buddy/examples/solitare/solitare.cxx
diff --git a/lib/buddy/m4/debug.m4 b/libs/buddy/m4/debug.m4
similarity index 100%
rename from lib/buddy/m4/debug.m4
rename to libs/buddy/m4/debug.m4
diff --git a/lib/buddy/src/CMakeLists.txt b/libs/buddy/src/CMakeLists.txt
similarity index 100%
rename from lib/buddy/src/CMakeLists.txt
rename to libs/buddy/src/CMakeLists.txt
diff --git a/lib/buddy/src/Makefile.am b/libs/buddy/src/Makefile.am
similarity index 100%
rename from lib/buddy/src/Makefile.am
rename to libs/buddy/src/Makefile.am
diff --git a/lib/buddy/src/Makefile.in b/libs/buddy/src/Makefile.in
similarity index 100%
rename from lib/buddy/src/Makefile.in
rename to libs/buddy/src/Makefile.in
diff --git a/lib/buddy/src/bdd.h b/libs/buddy/src/bdd.h
similarity index 100%
rename from lib/buddy/src/bdd.h
rename to libs/buddy/src/bdd.h
diff --git a/lib/buddy/src/bddio.c b/libs/buddy/src/bddio.c
similarity index 100%
rename from lib/buddy/src/bddio.c
rename to libs/buddy/src/bddio.c
diff --git a/lib/buddy/src/bddop.c b/libs/buddy/src/bddop.c
similarity index 100%
rename from lib/buddy/src/bddop.c
rename to libs/buddy/src/bddop.c
diff --git a/lib/buddy/src/bddtest.cxx b/libs/buddy/src/bddtest.cxx
similarity index 100%
rename from lib/buddy/src/bddtest.cxx
rename to libs/buddy/src/bddtest.cxx
diff --git a/lib/buddy/src/bddtree.h b/libs/buddy/src/bddtree.h
similarity index 100%
rename from lib/buddy/src/bddtree.h
rename to libs/buddy/src/bddtree.h
diff --git a/lib/buddy/src/bvec.c b/libs/buddy/src/bvec.c
similarity index 100%
rename from lib/buddy/src/bvec.c
rename to libs/buddy/src/bvec.c
diff --git a/lib/buddy/src/bvec.h b/libs/buddy/src/bvec.h
similarity index 100%
rename from lib/buddy/src/bvec.h
rename to libs/buddy/src/bvec.h
diff --git a/lib/buddy/src/cache.c b/libs/buddy/src/cache.c
similarity index 100%
rename from lib/buddy/src/cache.c
rename to libs/buddy/src/cache.c
diff --git a/lib/buddy/src/cache.h b/libs/buddy/src/cache.h
similarity index 100%
rename from lib/buddy/src/cache.h
rename to libs/buddy/src/cache.h
diff --git a/lib/buddy/src/cppext.cxx b/libs/buddy/src/cppext.cxx
similarity index 100%
rename from lib/buddy/src/cppext.cxx
rename to libs/buddy/src/cppext.cxx
diff --git a/lib/buddy/src/fdd.c b/libs/buddy/src/fdd.c
similarity index 100%
rename from lib/buddy/src/fdd.c
rename to libs/buddy/src/fdd.c
diff --git a/lib/buddy/src/fdd.h b/libs/buddy/src/fdd.h
similarity index 100%
rename from lib/buddy/src/fdd.h
rename to libs/buddy/src/fdd.h
diff --git a/lib/buddy/src/imatrix.c b/libs/buddy/src/imatrix.c
similarity index 100%
rename from lib/buddy/src/imatrix.c
rename to libs/buddy/src/imatrix.c
diff --git a/lib/buddy/src/imatrix.h b/libs/buddy/src/imatrix.h
similarity index 100%
rename from lib/buddy/src/imatrix.h
rename to libs/buddy/src/imatrix.h
diff --git a/lib/buddy/src/kernel.c b/libs/buddy/src/kernel.c
similarity index 100%
rename from lib/buddy/src/kernel.c
rename to libs/buddy/src/kernel.c
diff --git a/lib/buddy/src/kernel.h b/libs/buddy/src/kernel.h
similarity index 100%
rename from lib/buddy/src/kernel.h
rename to libs/buddy/src/kernel.h
diff --git a/lib/buddy/src/pairs.c b/libs/buddy/src/pairs.c
similarity index 100%
rename from lib/buddy/src/pairs.c
rename to libs/buddy/src/pairs.c
diff --git a/lib/buddy/src/prime.c b/libs/buddy/src/prime.c
similarity index 100%
rename from lib/buddy/src/prime.c
rename to libs/buddy/src/prime.c
diff --git a/lib/buddy/src/prime.h b/libs/buddy/src/prime.h
similarity index 100%
rename from lib/buddy/src/prime.h
rename to libs/buddy/src/prime.h
diff --git a/lib/buddy/src/reorder.c b/libs/buddy/src/reorder.c
similarity index 100%
rename from lib/buddy/src/reorder.c
rename to libs/buddy/src/reorder.c
diff --git a/lib/buddy/src/tree.c b/libs/buddy/src/tree.c
similarity index 100%
rename from lib/buddy/src/tree.c
rename to libs/buddy/src/tree.c
diff --git a/lib/buddy/tools/config.guess b/libs/buddy/tools/config.guess
similarity index 100%
rename from lib/buddy/tools/config.guess
rename to libs/buddy/tools/config.guess
diff --git a/lib/buddy/tools/config.sub b/libs/buddy/tools/config.sub
similarity index 100%
rename from lib/buddy/tools/config.sub
rename to libs/buddy/tools/config.sub
diff --git a/lib/buddy/tools/depcomp b/libs/buddy/tools/depcomp
similarity index 100%
rename from lib/buddy/tools/depcomp
rename to libs/buddy/tools/depcomp
diff --git a/lib/buddy/tools/install-sh b/libs/buddy/tools/install-sh
similarity index 100%
rename from lib/buddy/tools/install-sh
rename to libs/buddy/tools/install-sh
diff --git a/lib/buddy/tools/ltmain.sh b/libs/buddy/tools/ltmain.sh
similarity index 100%
rename from lib/buddy/tools/ltmain.sh
rename to libs/buddy/tools/ltmain.sh
diff --git a/lib/buddy/tools/missing b/libs/buddy/tools/missing
similarity index 100%
rename from lib/buddy/tools/missing
rename to libs/buddy/tools/missing
diff --git a/lib/parser/CMakeLists.txt b/libs/parser/CMakeLists.txt
similarity index 100%
rename from lib/parser/CMakeLists.txt
rename to libs/parser/CMakeLists.txt
diff --git a/lib/parser/LICENSE b/libs/parser/LICENSE
similarity index 100%
rename from lib/parser/LICENSE
rename to libs/parser/LICENSE
diff --git a/lib/parser/README.md b/libs/parser/README.md
similarity index 100%
rename from lib/parser/README.md
rename to libs/parser/README.md
diff --git a/lib/parser/src/CMakeLists.txt b/libs/parser/src/CMakeLists.txt
similarity index 100%
rename from lib/parser/src/CMakeLists.txt
rename to libs/parser/src/CMakeLists.txt
diff --git a/lib/parser/src/Net.cpp b/libs/parser/src/Net.cpp
similarity index 100%
rename from lib/parser/src/Net.cpp
rename to libs/parser/src/Net.cpp
diff --git a/lib/parser/src/Net.hpp b/libs/parser/src/Net.hpp
similarity index 100%
rename from lib/parser/src/Net.hpp
rename to libs/parser/src/Net.hpp
diff --git a/lib/parser/src/RdPMonteur.hpp b/libs/parser/src/RdPMonteur.hpp
similarity index 100%
rename from lib/parser/src/RdPMonteur.hpp
rename to libs/parser/src/RdPMonteur.hpp
diff --git a/lib/parser/src/RdPMonteur.l b/libs/parser/src/RdPMonteur.l
similarity index 100%
rename from lib/parser/src/RdPMonteur.l
rename to libs/parser/src/RdPMonteur.l
diff --git a/lib/parser/src/RdPMonteur.y b/libs/parser/src/RdPMonteur.y
similarity index 100%
rename from lib/parser/src/RdPMonteur.y
rename to libs/parser/src/RdPMonteur.y
diff --git a/lib/sog/CMakeLists.txt b/libs/sog/CMakeLists.txt
similarity index 80%
rename from lib/sog/CMakeLists.txt
rename to libs/sog/CMakeLists.txt
index 86b672dee421b9717a46adba63b132ec4041f8cf..de31a980b75a43fea4fe01ea59b6b248655f3ed5 100644
--- a/lib/sog/CMakeLists.txt
+++ b/libs/sog/CMakeLists.txt
@@ -14,12 +14,12 @@ 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}/lib/buddy")
+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}/lib/parser")
+add_subdirectory(${PARSER_DIR} "${CMAKE_CURRENT_BINARY_DIR}/libs/parser")
 
 # add source folder
 include_directories(${SRC_DIR})
diff --git a/lib/sog/src/CMakeLists.txt b/libs/sog/src/CMakeLists.txt
similarity index 100%
rename from lib/sog/src/CMakeLists.txt
rename to libs/sog/src/CMakeLists.txt
diff --git a/lib/sog/src/Class_of_state.hpp b/libs/sog/src/Class_of_state.hpp
similarity index 100%
rename from lib/sog/src/Class_of_state.hpp
rename to libs/sog/src/Class_of_state.hpp
diff --git a/lib/sog/src/MDGraph.cpp b/libs/sog/src/MDGraph.cpp
similarity index 100%
rename from lib/sog/src/MDGraph.cpp
rename to libs/sog/src/MDGraph.cpp
diff --git a/lib/sog/src/MDGraph.hpp b/libs/sog/src/MDGraph.hpp
similarity index 100%
rename from lib/sog/src/MDGraph.hpp
rename to libs/sog/src/MDGraph.hpp
diff --git a/lib/sog/src/Modular_Class_of_state.hpp b/libs/sog/src/Modular_Class_of_state.hpp
similarity index 100%
rename from lib/sog/src/Modular_Class_of_state.hpp
rename to libs/sog/src/Modular_Class_of_state.hpp
diff --git a/lib/sog/src/Modular_Obs_Graph.cpp b/libs/sog/src/Modular_Obs_Graph.cpp
similarity index 100%
rename from lib/sog/src/Modular_Obs_Graph.cpp
rename to libs/sog/src/Modular_Obs_Graph.cpp
diff --git a/lib/sog/src/Modular_Obs_Graph.hpp b/libs/sog/src/Modular_Obs_Graph.hpp
similarity index 100%
rename from lib/sog/src/Modular_Obs_Graph.hpp
rename to libs/sog/src/Modular_Obs_Graph.hpp
diff --git a/lib/sog/src/RdPBDD.cpp b/libs/sog/src/RdPBDD.cpp
similarity index 100%
rename from lib/sog/src/RdPBDD.cpp
rename to libs/sog/src/RdPBDD.cpp
diff --git a/lib/sog/src/RdPBDD.hpp b/libs/sog/src/RdPBDD.hpp
similarity index 100%
rename from lib/sog/src/RdPBDD.hpp
rename to libs/sog/src/RdPBDD.hpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cefb2a7aa2a27bdd883edb83a34a4b8affa1ac2f..a05e3c900790db2270b9e038b34a4143c03271ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 add_executable(sogMBT main.cpp)
 
 target_include_directories(sogMBT PRIVATE
-  "${PROJECT_SOURCE_DIR}/lib/buddy/src"
-  "${PROJECT_SOURCE_DIR}/lib/parser/src"
-  "${PROJECT_SOURCE_DIR}/lib/sog/src")
+  "${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