diff --git a/tlm_cmd/block_command_executor.c b/tlm_cmd/block_command_executor.c
index 0b5af451..bed5f684 100644
--- a/tlm_cmd/block_command_executor.c
+++ b/tlm_cmd/block_command_executor.c
@@ -14,7 +14,7 @@
 #include "packet_handler.h"
 #include "../library/endian.h"
 #include "../system/time_manager/time_manager.h"
-#include "common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet_util.h"
 
 static BlockCommandExecutor block_command_executor_;
 const BlockCommandExecutor* const block_command_executor = &block_command_executor_;
diff --git a/tlm_cmd/block_command_executor.h b/tlm_cmd/block_command_executor.h
index b7d5af32..16e8042e 100644
--- a/tlm_cmd/block_command_executor.h
+++ b/tlm_cmd/block_command_executor.h
@@ -9,7 +9,7 @@
 #ifndef BLOCK_COMMAND_EXECUTOR_H_
 #define BLOCK_COMMAND_EXECUTOR_H_
 
-#include "common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet.h"
 #include "block_command_table.h"
 
 /**
diff --git a/tlm_cmd/block_command_loader.c b/tlm_cmd/block_command_loader.c
index f92ed0bc..5765e30a 100644
--- a/tlm_cmd/block_command_loader.c
+++ b/tlm_cmd/block_command_loader.c
@@ -12,7 +12,7 @@
 #include "../applications/timeline_command_dispatcher_id_define.h"
 #include "block_command_executor.h"
 #include <src_user/tlm_cmd/command_definitions.h> // for rotate/combine block
-#include "common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet_util.h"
 #include "../library/endian.h"
 
 #define BCL_PARAM_MAX_LENGTH BCT_CMD_MAX_LENGTH
diff --git a/tlm_cmd/block_command_table.c b/tlm_cmd/block_command_table.c
index b122002a..b2053b82 100644
--- a/tlm_cmd/block_command_table.c
+++ b/tlm_cmd/block_command_table.c
@@ -18,7 +18,7 @@
 #include "../system/time_manager/time_manager.h"
 #include "../library/endian.h"
 #include "../system/watchdog_timer/watchdog_timer.h"
-#include "common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet_util.h"
 
 // FIXME: この include は依存的にダメなので， TCP → Space Packet 大工事が終わったら直す
 #include "./ccsds/space_packet_protocol/space_packet.h"
diff --git a/tlm_cmd/block_command_table.h b/tlm_cmd/block_command_table.h
index 64e4e451..ef0c4ddb 100644
--- a/tlm_cmd/block_command_table.h
+++ b/tlm_cmd/block_command_table.h
@@ -35,7 +35,7 @@ typedef uint32_t bct_id_t;
 #error Illegal value for SIZE_OF_BCT_ID_T
 #endif
 
-#include "common_cmd_packet.h" // bct_id_t の定義よりあとにinclude
+#include "./common_packet/common_cmd_packet.h" // bct_id_t の定義よりあとにinclude
 
 /*
 Block Command Table は
diff --git a/tlm_cmd/command_analyze.c b/tlm_cmd/command_analyze.c
index 524a2ac7..4660a69b 100644
--- a/tlm_cmd/command_analyze.c
+++ b/tlm_cmd/command_analyze.c
@@ -4,7 +4,7 @@
  * @brief  コマンドの実行・登録，コマンド関連処理
  */
 #include "command_analyze.h"
-#include "common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet_util.h"
 #include <src_user/tlm_cmd/command_definitions.h>
 #include "../library/print.h"
  #include "../system/event_manager/event_logger.h"
diff --git a/tlm_cmd/command_analyze.h b/tlm_cmd/command_analyze.h
index 196f92ab..5fc5941f 100644
--- a/tlm_cmd/command_analyze.h
+++ b/tlm_cmd/command_analyze.h
@@ -5,8 +5,8 @@
 #ifndef COMMAND_ANALYZE_H_
 #define COMMAND_ANALYZE_H_
 
-#include "common_cmd_packet.h"
-#include "common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet_util.h"
 #include <src_user/tlm_cmd/command_definitions.h>
 
 #define CA_TLM_PAGE_SIZE      (32)                                  //!< コマンドテーブルの1テレメトリパケット(=1ページ)に格納されるコマンド数（ページネーション用）
diff --git a/tlm_cmd/command_dispatcher.h b/tlm_cmd/command_dispatcher.h
index e5b8489f..cabbc18e 100644
--- a/tlm_cmd/command_dispatcher.h
+++ b/tlm_cmd/command_dispatcher.h
@@ -5,8 +5,8 @@
 #ifndef COMMAND_DISPATCHER_H_
 #define COMMAND_DISPATCHER_H_
 
-#include "common_cmd_packet_util.h"
-#include "common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet.h"
 #include "packet_list.h"
 #include "../system/time_manager/obc_time.h"
 #include "../library/result.h"
diff --git a/tlm_cmd/command_dispatcher_manager.c b/tlm_cmd/command_dispatcher_manager.c
index 0c3d72d4..e9d29f7d 100644
--- a/tlm_cmd/command_dispatcher_manager.c
+++ b/tlm_cmd/command_dispatcher_manager.c
@@ -8,7 +8,7 @@
 #include "command_dispatcher_manager.h"
 #include <stddef.h>
 #include <string.h>
-#include "./common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet_util.h"
 
 /**
  * @brief  cdis を cdis mgr に登録されているか探し，見つかった場合は idx を返す
diff --git a/tlm_cmd/command_dispatcher_manager.h b/tlm_cmd/command_dispatcher_manager.h
index e1bddb6d..c1423195 100644
--- a/tlm_cmd/command_dispatcher_manager.h
+++ b/tlm_cmd/command_dispatcher_manager.h
@@ -7,7 +7,7 @@
 #ifndef COMMAND_DISPATCHER_MANAGER_H_
 #define COMMAND_DISPATCHER_MANAGER_H_
 
-#include "./common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet.h"
 #include "./command_dispatcher.h"
 #include "../library/result.h"
 
diff --git a/tlm_cmd/packet_handler.h b/tlm_cmd/packet_handler.h
index 3a5fbf1f..1a82d011 100644
--- a/tlm_cmd/packet_handler.h
+++ b/tlm_cmd/packet_handler.h
@@ -5,7 +5,7 @@
 #ifndef PACKET_HANDLER_H_
 #define PACKET_HANDLER_H_
 
-#include "common_tlm_cmd_packet.h"
+#include "./common_packet/common_tlm_cmd_packet.h"
 #include "packet_list.h"
 #include "../applications/timeline_command_dispatcher_id_define.h"
 
diff --git a/tlm_cmd/packet_list.c b/tlm_cmd/packet_list.c
index 225c47d4..584e6663 100644
--- a/tlm_cmd/packet_list.c
+++ b/tlm_cmd/packet_list.c
@@ -6,7 +6,7 @@
 #include "packet_list.h"
 
 #include "../system/time_manager/time_manager.h"
-#include "common_tlm_cmd_packet.h"
+#include "./common_packet/common_tlm_cmd_packet.h"
 #include "./ccsds/space_packet_protocol/cmd_space_packet.h"     // FIXME: CSP 依存をなくすべき
 #include "block_command_executor.h"
 #include "block_command_table.h"
diff --git a/tlm_cmd/packet_list.h b/tlm_cmd/packet_list.h
index 3fc73782..98a17c74 100644
--- a/tlm_cmd/packet_list.h
+++ b/tlm_cmd/packet_list.h
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 
-#include "common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet.h"
 #include "block_command_table.h"
 
 
diff --git a/tlm_cmd/packet_list_util.h b/tlm_cmd/packet_list_util.h
index 6610e8f8..9d7ae7f0 100644
--- a/tlm_cmd/packet_list_util.h
+++ b/tlm_cmd/packet_list_util.h
@@ -6,7 +6,7 @@
 #define PACKET_LIST_UTIL_H_
 
 #include "packet_list.h"
-#include "common_tlm_cmd_packet.h"
+#include "./common_packet/common_tlm_cmd_packet.h"
 
 /**
  * @brief static に確保された PL_Node 配列と CTCP 配列を受け取りその領域を使用して PL を初期化
diff --git a/tlm_cmd/telemetry_frame.c b/tlm_cmd/telemetry_frame.c
index 39310b26..77ccc4d1 100644
--- a/tlm_cmd/telemetry_frame.c
+++ b/tlm_cmd/telemetry_frame.c
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include "../library/print.h"
 #include "../library/endian.h"
-#include "./common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet_util.h"
 
 static void initialize_tlm_table_(void);
 
diff --git a/tlm_cmd/telemetry_frame.h b/tlm_cmd/telemetry_frame.h
index a54a32cb..32ecde7c 100644
--- a/tlm_cmd/telemetry_frame.h
+++ b/tlm_cmd/telemetry_frame.h
@@ -5,7 +5,7 @@
 #ifndef TELEMETRY_FRAME_H_
 #define TELEMETRY_FRAME_H_
 
-#include "./common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet.h"
 #include <src_user/tlm_cmd/telemetry_definitions.h>
 
 #define TF_TLM_PAGE_SIZE (64)                                    //!< テレメテーブルの1テレメトリパケット(=1ページ)に格納されるテレメ数
diff --git a/tlm_cmd/telemetry_generator.c b/tlm_cmd/telemetry_generator.c
index e470fa73..4b60c3d1 100644
--- a/tlm_cmd/telemetry_generator.c
+++ b/tlm_cmd/telemetry_generator.c
@@ -6,8 +6,8 @@
 #include "telemetry_frame.h"
 #include "packet_handler.h"
 #include "../system/time_manager/time_manager.h"
-#include "common_cmd_packet.h"
-#include "common_cmd_packet_util.h"
+#include "./common_packet/common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet_util.h"
 #include <src_user/tlm_cmd/telemetry_definitions.h>
 #include <src_user/tlm_cmd/user_packet_handler.h>
 #include <src_user/settings/tlm_cmd/common_tlm_packet_define.h>
diff --git a/tlm_cmd/telemetry_generator.h b/tlm_cmd/telemetry_generator.h
index 43874952..d886f8df 100644
--- a/tlm_cmd/telemetry_generator.h
+++ b/tlm_cmd/telemetry_generator.h
@@ -1,7 +1,7 @@
 #ifndef TELEMETRY_GENERATOR_H_
 #define TELEMETRY_GENERATOR_H_
 
-#include "common_cmd_packet.h"
+#include "./common_packet/common_cmd_packet.h"
 
 // deprecated
 CCP_CmdRet Cmd_GENERATE_TLM(const CommonCmdPacket* packet);