8 files changed, 34 insertions, 44 deletions
diff --git a/core/src/data/controller/cli/mod.rs b/core/src/data/controller/cli/mod.rs
deleted file mode 100644
index 043f7b8..0000000
--- a/core/src/data/controller/cli/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod cli_command;
-\ No newline at end of file
diff --git a/core/src/data/controller/cli/cli_command.rs b/core/src/data/controller/controller_cli.rs
index 9fee0b0..9ab49d6 100644
--- a/core/src/data/controller/cli/cli_command.rs
+++ b/core/src/data/controller/controller_cli.rs
@@ -3,7 +3,7 @@ use clap::{Args, Parser, Subcommand};
 use clearscreen::clear;
 use log::info;
 use nogamepads::entry_mutex;
-use crate::data::controller::runtime::structs::ControllerRuntime;
+use crate::data::controller::controller_runtime::ControllerRuntime;
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
diff --git a/core/src/data/controller/implements.rs b/core/src/data/controller/controller_data.rs
index 86a19de..a3f1c02 100644
--- a/core/src/data/controller/implements.rs
+++ b/core/src/data/controller/controller_data.rs
@@ -1,7 +1,15 @@
 use std::sync::{Arc, Mutex};
-use crate::data::controller::runtime::structs::ControllerRuntime;
-use crate::data::controller::structs::ControllerData;
-use crate::data::player::structs::Player;
+use crate::data::controller::controller_runtime::ControllerRuntime;
+use crate::data::player::player_data::Player;
+
+/// Controller-side Data
+/// Describes the basic information of the controller side
+#[derive(Default)]
+pub struct ControllerData {
+
+    /// Player bound to the controller side
+    pub(crate) player: Player
+}
 
 impl ControllerData {
 
diff --git a/core/src/data/controller/runtime/implements.rs b/core/src/data/controller/controller_runtime.rs
index 1f2734a..5e7bb6d 100644
--- a/core/src/data/controller/runtime/implements.rs
+++ b/core/src/data/controller/controller_runtime.rs
@@ -1,11 +1,28 @@
 use std::collections::{HashMap, VecDeque};
+use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering::SeqCst;
 use log::trace;
-use crate::data::controller::runtime::structs::ControllerRuntime;
-use crate::data::message::enums::{ControlMessage, GameMessage};
+use crate::data::game::types::GameInfo;
+use crate::data::message::message_enums::{ControlMessage, GameMessage};
 use crate::data::message::traits::MessageManager;
+use crate::data::player::player_data::Player;
 use crate::service::service_types::ServiceType;
 
+/// Controller-side runtime
+/// Stores all data involved in game pad_client interactions during runtime
+#[derive(Default)]
+pub struct ControllerRuntime {
+
+    pub(crate) service_type: ServiceType,
+    pub(crate) received: HashMap<(ServiceType, u8), VecDeque<GameMessage>>,
+    pub(crate) send: HashMap<(ServiceType, u8), VecDeque<ControlMessage>>,
+
+    pub(crate) player: Player,
+
+    pub game_info: GameInfo,
+    pub close: AtomicBool,
+}
+
 /// Message manager for controller-side runtime
 /// After the service starts, it can be accessed or relevant messages can be stored.
 impl MessageManager<GameMessage, ControlMessage, u8> for ControllerRuntime {
diff --git a/core/src/data/controller/mod.rs b/core/src/data/controller/mod.rs
index 019ebcf..ce9d9c3 100644
--- a/core/src/data/controller/mod.rs
+++ b/core/src/data/controller/mod.rs
@@ -1,4 +1,3 @@
-pub mod cli;
-pub mod runtime;
-pub mod implements;
-pub mod structs;
-\ No newline at end of file
+pub mod controller_cli;
+pub mod controller_runtime;
+pub mod controller_data;
+\ No newline at end of file
diff --git a/core/src/data/controller/runtime/mod.rs b/core/src/data/controller/runtime/mod.rs
deleted file mode 100644
index 0ff870f..0000000
--- a/core/src/data/controller/runtime/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod implements;
-pub mod structs;
-\ No newline at end of file
diff --git a/core/src/data/controller/runtime/structs.rs b/core/src/data/controller/runtime/structs.rs
deleted file mode 100644
index bfd39c5..0000000
--- a/core/src/data/controller/runtime/structs.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-use std::collections::{HashMap, VecDeque};
-use std::sync::atomic::AtomicBool;
-use crate::data::game::types::GameInfo;
-use crate::data::message::enums::{ControlMessage, GameMessage};
-use crate::data::player::structs::Player;
-use crate::service::service_types::ServiceType;
-
-/// Controller-side runtime
-/// Stores all data involved in game pad_client interactions during runtime
-#[derive(Default)]
-pub struct ControllerRuntime {
-
-    pub(crate) service_type: ServiceType,
-    pub(crate) received: HashMap<(ServiceType, u8), VecDeque<GameMessage>>,
-    pub(crate) send: HashMap<(ServiceType, u8), VecDeque<ControlMessage>>,
-
-    pub(crate) player: Player,
-
-    pub game_info: GameInfo,
-    pub close: AtomicBool,
-}
-\ No newline at end of file
diff --git a/core/src/data/controller/structs.rs b/core/src/data/controller/structs.rs
deleted file mode 100644
index c6fdd31..0000000
--- a/core/src/data/controller/structs.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use crate::data::player::structs::Player;
-
-/// Controller-side Data
-/// Describes the basic information of the controller side
-#[derive(Default)]
-pub struct ControllerData {
-
-    /// Player bound to the controller side
-    pub(crate) player: Player
-}
-\ No newline at end of file