fix layout

diff --git a/bundled/taskflow-3.6.0/include/algorithm/critical.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/critical.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/critical.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/critical.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/data_pipeline.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/data_pipeline.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/data_pipeline.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/data_pipeline.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/find.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/find.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/find.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/find.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/for_each.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/for_each.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/for_each.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/for_each.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/launch.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/launch.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/launch.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/launch.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/partitioner.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/partitioner.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/partitioner.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/partitioner.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/pipeline.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/pipeline.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/pipeline.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/pipeline.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/reduce.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/reduce.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/reduce.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/reduce.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/scan.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/scan.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/scan.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/scan.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/sort.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/sort.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/sort.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/sort.hpp

diff --git a/bundled/taskflow-3.6.0/include/algorithm/transform.hpp b/bundled/taskflow-3.6.0/include/taskflow/algorithm/transform.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/algorithm/transform.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/algorithm/transform.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/async.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/async.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/async.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/async.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/async_task.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/async_task.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/async_task.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/async_task.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/declarations.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/declarations.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/declarations.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/declarations.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/environment.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/environment.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/environment.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/environment.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/error.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/error.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/error.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/error.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/executor-module-opt.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/executor-module-opt.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/executor-module-opt.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/executor-module-opt.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/executor.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/executor.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/executor.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/executor.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/flow_builder.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/flow_builder.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/flow_builder.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/flow_builder.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/graph.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/graph.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/graph.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/graph.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/notifier.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/notifier.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/notifier.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/notifier.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/observer.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/observer.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/observer.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/observer.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/semaphore.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/semaphore.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/semaphore.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/semaphore.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/task.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/task.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/task.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/task.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/taskflow.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/taskflow.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/taskflow.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/taskflow.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/topology.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/topology.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/topology.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/topology.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/tsq.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/tsq.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/tsq.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/tsq.hpp

diff --git a/bundled/taskflow-3.6.0/include/core/worker.hpp b/bundled/taskflow-3.6.0/include/taskflow/core/worker.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/core/worker.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/core/worker.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/find.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/find.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/find.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/find.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/for_each.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/for_each.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/for_each.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/for_each.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/matmul.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/matmul.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/matmul.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/matmul.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/merge.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/merge.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/merge.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/merge.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/reduce.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/reduce.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/reduce.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/reduce.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/scan.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/scan.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/scan.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/scan.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/sort.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/sort.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/sort.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/sort.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/transform.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/transform.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/transform.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/transform.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/algorithm/transpose.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/transpose.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/algorithm/transpose.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/algorithm/transpose.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_capturer.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_capturer.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_capturer.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_capturer.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_device.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_device.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_device.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_device.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_error.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_error.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_error.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_error.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_execution_policy.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_execution_policy.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_execution_policy.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_execution_policy.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_graph.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_graph.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_graph.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_graph.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_memory.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_memory.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_memory.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_memory.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_meta.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_meta.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_meta.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_meta.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_object.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_object.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_object.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_object.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_optimizer.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_optimizer.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_optimizer.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_optimizer.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_stream.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_stream.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_stream.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_stream.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cuda_task.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_task.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cuda_task.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cuda_task.hpp

diff --git a/bundled/taskflow-3.6.0/include/cuda/cudaflow.hpp b/bundled/taskflow-3.6.0/include/taskflow/cuda/cudaflow.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/cuda/cudaflow.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/cuda/cudaflow.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/connection.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/connection.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/connection.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/connection.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/dsl.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/dsl.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/dsl.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/dsl.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/meta_macro.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/meta_macro.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/meta_macro.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/meta_macro.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/task_analyzer.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/task_analyzer.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/task_analyzer.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/task_analyzer.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/task_dsl.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/task_dsl.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/task_dsl.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/task_dsl.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/task_trait.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/task_trait.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/task_trait.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/task_trait.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/tuple_utils.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/tuple_utils.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/tuple_utils.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/tuple_utils.hpp

diff --git a/bundled/taskflow-3.6.0/include/dsl/type_list.hpp b/bundled/taskflow-3.6.0/include/taskflow/dsl/type_list.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/dsl/type_list.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/dsl/type_list.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/algorithm/reduce.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/algorithm/reduce.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/algorithm/reduce.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/algorithm/reduce.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/algorithm/sycl_for_each.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/algorithm/sycl_for_each.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/algorithm/sycl_for_each.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/algorithm/sycl_for_each.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/algorithm/sycl_transform.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/algorithm/sycl_transform.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/algorithm/sycl_transform.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/algorithm/sycl_transform.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/sycl_execution_policy.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_execution_policy.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/sycl_execution_policy.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_execution_policy.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/sycl_graph.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_graph.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/sycl_graph.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_graph.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/sycl_meta.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_meta.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/sycl_meta.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_meta.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/sycl_task.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_task.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/sycl_task.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/sycl_task.hpp

diff --git a/bundled/taskflow-3.6.0/include/sycl/syclflow.hpp b/bundled/taskflow-3.6.0/include/taskflow/sycl/syclflow.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/sycl/syclflow.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/sycl/syclflow.hpp

diff --git a/bundled/taskflow-3.6.0/include/taskflow.hpp b/bundled/taskflow-3.6.0/include/taskflow/taskflow.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/taskflow.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/taskflow.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/iterator.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/iterator.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/iterator.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/iterator.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/macros.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/macros.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/macros.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/macros.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/math.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/math.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/math.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/math.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/object_pool.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/object_pool.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/object_pool.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/object_pool.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/os.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/os.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/os.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/os.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/serializer.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/serializer.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/serializer.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/serializer.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/singleton.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/singleton.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/singleton.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/singleton.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/small_vector.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/small_vector.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/small_vector.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/small_vector.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/stream.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/stream.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/stream.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/stream.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/traits.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/traits.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/traits.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/traits.hpp

diff --git a/bundled/taskflow-3.6.0/include/utility/uuid.hpp b/bundled/taskflow-3.6.0/include/taskflow/utility/uuid.hpp
similarity index 100%
rename from bundled/taskflow-3.6.0/include/utility/uuid.hpp
rename to bundled/taskflow-3.6.0/include/taskflow/utility/uuid.hpp