diff --git a/src/ast.rs b/src/ast.rs
index 63a5ba2e..923104c7 100644
--- a/src/ast.rs
+++ b/src/ast.rs
@@ -256,7 +256,7 @@ impl LiteralValue {
     /// LiteralValueをNyashBoxに変換
     pub fn to_nyash_box(&self) -> Box<dyn NyashBox> {
         use crate::box_trait::{StringBox, IntegerBox, BoolBox, VoidBox};
-        use crate::boxes::math_box::FloatBox;
+        use crate::boxes::FloatBox;
         
         match self {
             LiteralValue::String(s) => Box::new(StringBox::new(s)),
@@ -272,7 +272,7 @@ impl LiteralValue {
         #[allow(unused_imports)]
         use std::any::Any;
         use crate::box_trait::{StringBox, IntegerBox, BoolBox, VoidBox};
-        use crate::boxes::math_box::FloatBox;
+        use crate::boxes::FloatBox;
         
         if let Some(string_box) = box_val.as_any().downcast_ref::<StringBox>() {
             Some(LiteralValue::String(string_box.value.clone()))
diff --git a/src/box_operators.rs b/src/box_operators.rs
index 5470c242..62a2fe06 100644
--- a/src/box_operators.rs
+++ b/src/box_operators.rs
@@ -10,7 +10,7 @@
  */
 
 use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox};
-use crate::boxes::math_box::FloatBox;
+use crate::boxes::FloatBox;
 use crate::operator_traits::{
     NyashAdd, NyashSub, NyashMul, NyashDiv,
     DynamicAdd, DynamicSub, DynamicMul, DynamicDiv,
diff --git a/src/boxes/map_box.rs b/src/boxes/map_box.rs
index e2e834cf..c8535d74 100644
--- a/src/boxes/map_box.rs
+++ b/src/boxes/map_box.rs
@@ -104,7 +104,7 @@
  */
 
 use crate::box_trait::{BoxCore, BoxBase, NyashBox, StringBox, IntegerBox, BoolBox};
-use crate::boxes::array::ArrayBox;
+use crate::boxes::ArrayBox;
 use std::fmt::{Debug, Display};
 use std::any::Any;
 use std::collections::HashMap;
diff --git a/src/boxes/p2p_box.rs b/src/boxes/p2p_box.rs
index faf752ae..c21fa7c8 100644
--- a/src/boxes/p2p_box.rs
+++ b/src/boxes/p2p_box.rs
@@ -34,9 +34,8 @@
  */
 
 use crate::box_trait::{NyashBox, StringBox, BoolBox, BoxCore, BoxBase};
-use crate::boxes::intent_box::IntentBox;
+use crate::boxes::{IntentBox, MapBox};
 pub use crate::boxes::intent_box::Message;
-use crate::boxes::map_box::MapBox;
 use std::any::Any;
 use std::sync::{Arc, Mutex};
 use std::collections::HashMap;
diff --git a/src/boxes/random_box.rs b/src/boxes/random_box.rs
index 0f23f3c9..e321517d 100644
--- a/src/boxes/random_box.rs
+++ b/src/boxes/random_box.rs
@@ -68,8 +68,7 @@
  */
 
 use crate::box_trait::{NyashBox, StringBox, IntegerBox, BoolBox, BoxCore, BoxBase};
-use crate::boxes::array::ArrayBox;
-use crate::boxes::math_box::FloatBox;
+use crate::boxes::{ArrayBox, FloatBox};
 use std::fmt::{Debug, Display};
 use std::any::Any;
 use std::sync::{Arc, Mutex};
diff --git a/src/interpreter/box_methods.rs b/src/interpreter/box_methods.rs
index 6c1245a9..e769d5b1 100644
--- a/src/interpreter/box_methods.rs
+++ b/src/interpreter/box_methods.rs
@@ -47,7 +47,7 @@
  */
 
 use super::*;
-use crate::boxes::null_box::NullBox;
+use crate::boxes::NullBox;
 
 impl NyashInterpreter {
     // StringBox methods moved to methods/basic_methods.rs
diff --git a/src/interpreter/expressions.rs b/src/interpreter/expressions.rs
index b137f42d..3bc31300 100644
--- a/src/interpreter/expressions.rs
+++ b/src/interpreter/expressions.rs
@@ -9,8 +9,7 @@
 use super::*;
 use crate::ast::UnaryOperator;
 use crate::boxes::{buffer::BufferBox, JSONBox, HttpClientBox, StreamBox, RegexBox, IntentBox, P2PBox};
-use crate::boxes::math_box::FloatBox;
-use crate::boxes::{MathBox, ConsoleBox, TimeBox, RandomBox, SoundBox, DebugBox, file::FileBox, MapBox};
+use crate::boxes::{FloatBox, MathBox, ConsoleBox, TimeBox, RandomBox, SoundBox, DebugBox, file::FileBox, MapBox};
 use crate::box_trait::BoolBox;
 use crate::operator_traits::OperatorResolver;
 // TODO: Fix NullBox import issue later
diff --git a/src/interpreter/methods/basic_methods.rs b/src/interpreter/methods/basic_methods.rs
index b780a223..f5b1a2be 100644
--- a/src/interpreter/methods/basic_methods.rs
+++ b/src/interpreter/methods/basic_methods.rs
@@ -11,7 +11,7 @@
 
 use super::super::*;
 use crate::box_trait::{StringBox, IntegerBox, BoolBox, VoidBox};
-use crate::boxes::math_box::FloatBox;
+use crate::boxes::FloatBox;
 
 impl NyashInterpreter {
     /// StringBoxのメソッド呼び出しを実行
diff --git a/src/interpreter/methods/collection_methods.rs b/src/interpreter/methods/collection_methods.rs
index 3891c764..b8a00e0b 100644
--- a/src/interpreter/methods/collection_methods.rs
+++ b/src/interpreter/methods/collection_methods.rs
@@ -9,8 +9,7 @@
 
 use super::super::*;
 use crate::box_trait::{StringBox, IntegerBox, NyashBox, BoolBox};
-use crate::boxes::array::ArrayBox;
-use crate::boxes::map_box::MapBox;
+use crate::boxes::{ArrayBox, MapBox};
 
 impl NyashInterpreter {
     /// ArrayBoxのメソッド呼び出しを実行  
diff --git a/src/interpreter/methods/io_methods.rs b/src/interpreter/methods/io_methods.rs
index c6f82c4c..1f8aeaf5 100644
--- a/src/interpreter/methods/io_methods.rs
+++ b/src/interpreter/methods/io_methods.rs
@@ -9,7 +9,7 @@
 
 use super::super::*;
 use crate::box_trait::{ResultBox, StringBox, NyashBox};
-use crate::boxes::file::FileBox;
+use crate::boxes::FileBox;
 
 impl NyashInterpreter {
     /// FileBoxのメソッド呼び出しを実行
diff --git a/src/interpreter/objects.rs b/src/interpreter/objects.rs
index b5902714..da597b8c 100644
--- a/src/interpreter/objects.rs
+++ b/src/interpreter/objects.rs
@@ -7,9 +7,7 @@
  */
 
 use super::*;
-use crate::boxes::null_box::NullBox;
-use crate::boxes::console_box::ConsoleBox;
-use crate::boxes::math_box::FloatBox;
+use crate::boxes::{NullBox, ConsoleBox, FloatBox};
 // use crate::boxes::intent_box_wrapper::IntentBoxWrapper;
 use std::sync::Arc;
 
diff --git a/src/interpreter/special_methods.rs b/src/interpreter/special_methods.rs
index 35a62289..dde84363 100644
--- a/src/interpreter/special_methods.rs
+++ b/src/interpreter/special_methods.rs
@@ -13,7 +13,7 @@
  */
 
 use super::*;
-use crate::boxes::sound_box::SoundBox;
+use crate::boxes::SoundBox;
 use crate::method_box::MethodBox;
 
 impl NyashInterpreter {