diff --git a/phalerror/create_pel.cpp b/extensions/phal/create_pel.cpp
similarity index 100%
rename from phalerror/create_pel.cpp
rename to extensions/phal/create_pel.cpp
diff --git a/phalerror/create_pel.hpp b/extensions/phal/create_pel.hpp
similarity index 100%
rename from phalerror/create_pel.hpp
rename to extensions/phal/create_pel.hpp
diff --git a/phalerror/phal_error.cpp b/extensions/phal/phal_error.cpp
similarity index 100%
rename from phalerror/phal_error.cpp
rename to extensions/phal/phal_error.cpp
diff --git a/phalerror/phal_error.hpp b/extensions/phal/phal_error.hpp
similarity index 100%
rename from phalerror/phal_error.hpp
rename to extensions/phal/phal_error.hpp
diff --git a/meson.build b/meson.build
index 0913477..803a6fd 100644
--- a/meson.build
+++ b/meson.build
@@ -67,8 +67,8 @@
         'procedures/phal/proc_pre_poweroff.cpp',
         'procedures/phal/common_utils.cpp',
         'procedures/phal/check_host_running.cpp',
-        'phalerror/create_pel.cpp',
-        'phalerror/phal_error.cpp',
+        'extensions/phal/create_pel.cpp',
+        'extensions/phal/phal_error.cpp',
     ]
     extra_dependencies += [
         dependency('libdt-api'),
diff --git a/procedures/phal/check_host_running.cpp b/procedures/phal/check_host_running.cpp
index 92001b9..a85bf4d 100644
--- a/procedures/phal/check_host_running.cpp
+++ b/procedures/phal/check_host_running.cpp
@@ -4,8 +4,8 @@
 }
 
 #include "common_utils.hpp"
+#include "extensions/phal/create_pel.hpp"
 #include "p10_cfam.hpp"
-#include "phalerror/create_pel.hpp"
 #include "procedures/phal/common_utils.hpp"
 #include "registration.hpp"
 
diff --git a/procedures/phal/common_utils.cpp b/procedures/phal/common_utils.cpp
index 6f2995e..50742f6 100644
--- a/procedures/phal/common_utils.cpp
+++ b/procedures/phal/common_utils.cpp
@@ -4,7 +4,7 @@
 }
 #include "attributes_info.H"
 
-#include "phalerror/phal_error.hpp"
+#include "extensions/phal/phal_error.hpp"
 #include "procedures/phal/common_utils.hpp"
 
 #include <fmt/format.h>
diff --git a/procedures/phal/proc_pre_poweroff.cpp b/procedures/phal/proc_pre_poweroff.cpp
index 3997b19..658b446 100644
--- a/procedures/phal/proc_pre_poweroff.cpp
+++ b/procedures/phal/proc_pre_poweroff.cpp
@@ -1,4 +1,4 @@
-#include "phalerror/phal_error.hpp"
+#include "extensions/phal/phal_error.hpp"
 #include "procedures/phal/common_utils.hpp"
 #include "registration.hpp"
 
diff --git a/procedures/phal/start_host.cpp b/procedures/phal/start_host.cpp
index 152bd7e..d6b0b40 100644
--- a/procedures/phal/start_host.cpp
+++ b/procedures/phal/start_host.cpp
@@ -5,7 +5,7 @@
 
 #include "attributes_info.H"
 
-#include "phalerror/phal_error.hpp"
+#include "extensions/phal/phal_error.hpp"
 #include "procedures/phal/common_utils.hpp"
 #include "util.hpp"