diff --git a/makefile b/makefile
index d008bef..b99219f 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@ CC_GCC=g++
 CC_CLANG=clang++
 #CC=clang++
 #CPPSTD=-std=c++20   # -fconcepts-diagnostics-depth=2  # -Wfatal-errors
-CPPSTD=--std=c++17 # -Wfatal-errors
+CPPSTD=--std=c++17 -Wfatal-errors # TODO REMOVE # -Wfatal-errors
 
 ##########################################
 #         SUBMODULE LOCATION
diff --git a/optframe/optframe_lib.cpp b/optframe/optframe_lib.cpp
index ee0fd88..1556c25 100644
--- a/optframe/optframe_lib.cpp
+++ b/optframe/optframe_lib.cpp
@@ -14,14 +14,14 @@
 #include <OptFCore/FCore.hpp>
 #include <OptFCore/EA/RK/FDecoderOpRK.hpp>
 #include <OptFCore/FxCore.hpp>
-#include <OptFrame/BaseConcepts.hpp> // XESolution
+#include <OptFrame/Concepts/BaseConcepts.hpp> // XESolution
 #include <OptFrame/Heuristics/EA/RK/BasicDecoderRandomKeys.hpp>
 #include <OptFrame/Heuristics/EA/RK/BasicInitialEPopulationRK.hpp>
 #include <OptFrame/Heuristics/MultiObjective/ClassicNSGAII.hpp>
 #include <OptFrame/Hyper/HeuristicFactory.hpp>
 #include <OptFrame/Hyper/Loader.hpp>
 #include <OptFrame/Hyper/OptFrameList.hpp>
-#include <OptFrame/MyConcepts.hpp> // sref
+#include <OptFrame/Concepts/MyConcepts.hpp> // sref
 #include <OptFrame/Util/CheckCommand.hpp>
 
 class FCoreLibSolution
diff --git a/thirdparty/optframe-external b/thirdparty/optframe-external
index 73b2b29..d0dcfcf 160000
--- a/thirdparty/optframe-external
+++ b/thirdparty/optframe-external
@@ -1 +1 @@
-Subproject commit 73b2b29ff700f0458b2ac8d46eaa0232618fa18e
+Subproject commit d0dcfcf7464f0c803628e9157ddd10cccaefcf24