14 files changed, 55 insertions, 32 deletions
diff --git a/CODEOWNERS b/CODEOWNERS
index 1e498733..d68cd22f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,6 +2,6 @@
 /dev/kernel/ @amlel-el-mahrouss
 /dev/boot/ @amlel-el-mahrouss
 /dev/ddk/ @amlel-el-mahrouss
-/dev/open_msg/ @amlel-el-mahrouss
+/dev/libMsg/ @amlel-el-mahrouss
 /dev/libSystem/ @amlel-el-mahrouss
 # some other parts (tooling, frameworks) need ownership too.
 \ No newline at end of file
diff --git a/compile_flags.txt b/compile_flags.txt
index 12740fa6..fbfd1d06 100644
--- a/compile_flags.txt
+++ b/compile_flags.txt
@@ -3,7 +3,7 @@
 -Idev/user
 -Idev/boot
 -Idev/system_sdk
--Idev/generic_kits
+-Idev/misc
 -Idev/ddk
 -Ipublic/tools
 -Ipublic/tools/mk.app
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
index 446a1e85..2ddf980f 100644
--- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc
+++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc
@@ -14,7 +14,7 @@
 #include <KernelKit/Timer.h>
 #include <NetworkKit/IPC.h>
 #include <StorageKit/AHCI.h>
-#include <generic_kits/BenchKit/X64Chrono.h>
+#include <misc/BenchKit/X64Chrono.h>
 #include <modules/ACPI/ACPIFactoryInterface.h>
 #include <modules/CoreGfx/TextGfx.h>
 
diff --git a/dev/kernel/src/PEFCodeMgr.cc b/dev/kernel/src/PEFCodeMgr.cc
index dfd3601b..f5f0eeb5 100644
--- a/dev/kernel/src/PEFCodeMgr.cc
+++ b/dev/kernel/src/PEFCodeMgr.cc
@@ -203,17 +203,17 @@ const Char* PEFLoader::Path() {
 
 const Char* PEFLoader::AsString() {
 #ifdef __32x0__
-  return "32x0 PEF.";
+  return "32x0 PEF";
 #elif defined(__64x0__)
-  return "64x0 PEF.";
+  return "64x0 PEF";
 #elif defined(__x86_64__)
-  return "x86_64 PEF.";
+  return "x86_64 PEF";
 #elif defined(__aarch64__)
-  return "AARCH64 PEF.";
+  return "AARCH64 PEF";
 #elif defined(__powerpc64__)
-  return "POWER64 PEF.";
+  return "POWER64 PEF";
 #else
-  return "???? PEF.";
+  return "???? PEF";
 #endif  // __32x0__ || __64x0__ || __x86_64__ || __powerpc64__
 }
 
diff --git a/dev/generic_kits/.keep b/dev/libMsg/.keep
index e69de29b..e69de29b 100644
--- a/dev/generic_kits/.keep
+++ b/dev/libMsg/.keep
diff --git a/dev/libMsg/MsgKit/Network.h b/dev/libMsg/MsgKit/Network.h
new file mode 100644
index 00000000..c7b562a2
--- /dev/null
+++ b/dev/libMsg/MsgKit/Network.h
@@ -0,0 +1,9 @@
+/* -------------------------------------------
+
+  Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+
+------------------------------------------- */
+
+#pragma once
+
+#include  <libMsg/MsgKit/Server.h>
+\ No newline at end of file
diff --git a/dev/libMsg/MsgKit/Server.h b/dev/libMsg/MsgKit/Server.h
new file mode 100644
index 00000000..33d10407
--- /dev/null
+++ b/dev/libMsg/MsgKit/Server.h
@@ -0,0 +1,36 @@
+/* -------------------------------------------
+
+  Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
+
+------------------------------------------- */
+
+#pragma once
+
+#ifdef __cplusplus
+#include <public/frameworks/CoreFoundation.fwrk/headers/String.h>
+#else
+#include <libSystem/SystemKit/System.h>
+#endif
+
+struct LIBMSG_EXPR;
+
+/// @brief an expression chain of LibMSG.
+struct LIBMSG_EXPR final {
+#ifdef __cplusplus
+  CF::CFString* l_key{nullptr};
+  CF::CFString* l_value{nullptr};
+#else
+  VoidPtr l_key{nullptr};
+  VoidPtr l_value{nullptr};
+#endif
+
+  LIBMSG_EXPR* l_head{nullptr};
+  LIBMSG_EXPR* l_tail{nullptr};
+  LIBMSG_EXPR* l_child{nullptr};
+};
+
+typedef Void (*libmsg_func_t)(LIBMSG_EXPR* arg);
+
+IMPORT_C Void   libmsg_init_library(libmsg_func_t* funcs, SizeT cnt);
+IMPORT_C UInt32 libmsg_eval_library(struct LIBMSG_EXPR* head);
+IMPORT_C UInt32 libmsg_close_library(Void);
diff --git a/dev/open_msg/.keep b/dev/libMsg/obj/.keep
index e69de29b..e69de29b 100644
--- a/dev/open_msg/.keep
+++ b/dev/libMsg/obj/.keep
diff --git a/dev/open_msg/script/window_client.json b/dev/libMsg/script/window_client.json
index 4c8a21ba..4c8a21ba 100644
--- a/dev/open_msg/script/window_client.json
+++ b/dev/libMsg/script/window_client.json
diff --git a/dev/open_msg/obj/.keep b/dev/libMsg/src/.keep
index e69de29b..e69de29b 100644
--- a/dev/open_msg/obj/.keep
+++ b/dev/libMsg/src/.keep
diff --git a/dev/open_msg/src/.keep b/dev/misc/.keep
index e69de29b..e69de29b 100644
--- a/dev/open_msg/src/.keep
+++ b/dev/misc/.keep
diff --git a/dev/generic_kits/BenchKit/Chrono.h b/dev/misc/BenchKit/Chrono.h
index 394f16fd..394f16fd 100644
--- a/dev/generic_kits/BenchKit/Chrono.h
+++ b/dev/misc/BenchKit/Chrono.h
diff --git a/dev/generic_kits/BenchKit/X64Chrono.h b/dev/misc/BenchKit/X64Chrono.h
index 229146cb..706ce883 100644
--- a/dev/generic_kits/BenchKit/X64Chrono.h
+++ b/dev/misc/BenchKit/X64Chrono.h
@@ -6,7 +6,7 @@ Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
 
 #pragma once
 
-#include <generic_kits/BenchKit/Chrono.h>
+#include <misc/BenchKit/Chrono.h>
 
 #if defined(__NE_AMD64__)
 
diff --git a/dev/open_msg/MsgKit/Server.h b/dev/open_msg/MsgKit/Server.h
deleted file mode 100644
index 54183472..00000000
--- a/dev/open_msg/MsgKit/Server.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -------------------------------------------
-
-  Copyright (C) 2025, Amlal El Mahrouss, all rights reserved.
-
-------------------------------------------- */
-
-#pragma once
-
-#include <NeKit/KString.h>
-#include <NeKit/MutableArray.h>
-
-struct OPENMSG_EXPR;
-
-struct OPENMSG_EXPR {
-  Kernel::KString*                   l_head;
-  Kernel::MutableArray<OPENMSG_EXPR> l_args;
-};
-
-typedef Kernel::Void (*openmsg_func_t)(OPENMSG_EXPR* arg);
-
-EXTERN_C Kernel::Void openmsg_init_library(openmsg_func_t* funcs, Kernel::SizeT cnt);
-EXTERN_C Kernel::UInt32 openmsg_close_library(Kernel::Void);