diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/CannonShellLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/CannonShellLayer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/CannonShellLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/CannonShellLayer.java
index 201f13b6f..9b24c937a 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/CannonShellLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/CannonShellLayer.java
@@ -1,9 +1,9 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/GunGrenadeLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/GunGrenadeLayer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/GunGrenadeLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/GunGrenadeLayer.java
index 2fe370068..ca681aa1c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/GunGrenadeLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/GunGrenadeLayer.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/JavelinMissleLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/JavelinMissleLayer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/JavelinMissleLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/JavelinMissleLayer.java
index 99df9a589..b2c0e02fc 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/JavelinMissleLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/JavelinMissleLayer.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mk42DamageLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42DamageLayer.java
similarity index 97%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/Mk42DamageLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42DamageLayer.java
index e43fbe416..f0417390d 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mk42DamageLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42DamageLayer.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.config.server.CannonConfig;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mk42Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42Layer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/Mk42Layer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42Layer.java
index 28bb852fa..f93cc84d3 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mk42Layer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mk42Layer.java
@@ -1,18 +1,16 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
-import com.atsuishio.superbwarfare.entity.Mk42Entity;
 import com.atsuishio.superbwarfare.ModUtils;
-import software.bernie.geckolib.renderer.layer.GeoRenderLayer;
-import software.bernie.geckolib.renderer.GeoRenderer;
-import software.bernie.geckolib.cache.object.BakedGeoModel;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.MultiBufferSource;
-
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.atsuishio.superbwarfare.entity.Mk42Entity;
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.resources.ResourceLocation;
+import software.bernie.geckolib.cache.object.BakedGeoModel;
+import software.bernie.geckolib.renderer.GeoRenderer;
+import software.bernie.geckolib.renderer.layer.GeoRenderLayer;
 
 public class Mk42Layer extends GeoRenderLayer<Mk42Entity> {
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mle1934DamageLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934DamageLayer.java
similarity index 97%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/Mle1934DamageLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934DamageLayer.java
index 83546395e..1733bd50c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mle1934DamageLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934DamageLayer.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.config.server.CannonConfig;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mle1934Layer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934Layer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/Mle1934Layer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934Layer.java
index d07cea51e..aad8b881f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/Mle1934Layer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/Mle1934Layer.java
@@ -1,9 +1,9 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
+import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.Mle1934Entity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.atsuishio.superbwarfare.ModUtils;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/MortarLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/MortarLayer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/MortarLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/MortarLayer.java
index f8a6b4df6..e860a2acf 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/MortarLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/MortarLayer.java
@@ -1,9 +1,9 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.MortarEntity;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/ProjectileEntityInsideLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/ProjectileEntityInsideLayer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/ProjectileEntityInsideLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/ProjectileEntityInsideLayer.java
index a2d3817cd..a00231126 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/ProjectileEntityInsideLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/ProjectileEntityInsideLayer.java
@@ -1,9 +1,9 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
+import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.atsuishio.superbwarfare.ModUtils;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/ProjectileEntityLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/ProjectileEntityLayer.java
similarity index 97%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/ProjectileEntityLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/ProjectileEntityLayer.java
index d1a1de654..453191329 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/ProjectileEntityLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/ProjectileEntityLayer.java
@@ -1,9 +1,9 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
+import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.atsuishio.superbwarfare.ModUtils;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/RpgRocketLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/RpgRocketLayer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/RpgRocketLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/RpgRocketLayer.java
index d44a910d2..ecc9bb54f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/RpgRocketLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/RpgRocketLayer.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/layer/TargetLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/TargetLayer.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/layer/TargetLayer.java
rename to src/main/java/com/atsuishio/superbwarfare/client/layer/TargetLayer.java
index 515629a5f..88b152c4c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/layer/TargetLayer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/TargetLayer.java
@@ -1,9 +1,9 @@
-package com.atsuishio.superbwarfare.entity.layer;
+package com.atsuishio.superbwarfare.client.layer;
 
+import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.TargetEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.atsuishio.superbwarfare.ModUtils;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.texture.OverlayTexture;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/CannonShellEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java
similarity index 95%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/CannonShellEntityModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java
index dadbe34bb..3cd7ae1d0 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/CannonShellEntityModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/CannonShellEntityModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/ClaymoreModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java
similarity index 94%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/ClaymoreModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java
index c431771c4..1963a9b53 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/ClaymoreModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ClaymoreModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.ClaymoreEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/DroneModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java
similarity index 98%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/DroneModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java
index 38f484f1a..1becddd33 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/DroneModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DroneModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.DroneEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/GunGrenadeModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java
similarity index 95%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/GunGrenadeModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java
index b86c93c72..0968b4bba 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/GunGrenadeModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/GunGrenadeModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/HandGrenadeEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java
similarity index 92%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/HandGrenadeEntityModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java
index 4998f452d..823c222dd 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/HandGrenadeEntityModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/HandGrenadeEntityModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.HandGrenadeEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/JavelinMissileModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java
similarity index 93%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/JavelinMissileModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java
index 5c1a5e203..8399ac368 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/JavelinMissileModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/JavelinMissileModel.java
@@ -1,7 +1,7 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
-import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity;
 import com.atsuishio.superbwarfare.ModUtils;
+import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity;
 import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/Mk42Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java
similarity index 97%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/Mk42Model.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java
index 7e5ec0cc1..e384867f8 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/Mk42Model.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mk42Model.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.Mk42Entity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/Mle1934Model.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java
similarity index 97%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/Mle1934Model.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java
index 91b0d451e..77fa548a4 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/Mle1934Model.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/Mle1934Model.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.Mle1934Entity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/MortarModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarModel.java
similarity index 96%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/MortarModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarModel.java
index 7b77cbc5a..abd8865df 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/MortarModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.MortarEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/MortarShellEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java
similarity index 92%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/MortarShellEntityModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java
index 1a7562a20..e0e3688a6 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/MortarShellEntityModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/MortarShellEntityModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.MortarShellEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/ProjectileEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java
similarity index 88%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/ProjectileEntityModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java
index df49d15f7..205cbc8dc 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/ProjectileEntityModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/ProjectileEntityModel.java
@@ -1,7 +1,7 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
-import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
 import com.atsuishio.superbwarfare.ModUtils;
+import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
 import com.atsuishio.superbwarfare.event.ClientEventHandler;
 import com.atsuishio.superbwarfare.init.ModItems;
 import net.minecraft.client.Minecraft;
@@ -42,6 +42,9 @@ public class ProjectileEntityModel extends GeoModel<ProjectileEntity> {
     @Override
     public void setCustomAnimations(ProjectileEntity animatable, long instanceId, AnimationState animationState) {
         CoreGeoBone bone = getAnimationProcessor().getBone("bone");
-        bone.setHidden(animatable.tickCount <= 1);
+        Player player = Minecraft.getInstance().player;
+        if (player != null) {
+            bone.setHidden(animatable.position().distanceTo(player.position()) < 3);
+        }
     }
 }
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/RgoGrenadeEntityModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java
similarity index 92%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/RgoGrenadeEntityModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java
index 7a65eef75..136df7242 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/RgoGrenadeEntityModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RgoGrenadeEntityModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.RgoGrenadeEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/RpgRocketModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java
similarity index 93%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/RpgRocketModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java
index e3b05d81e..95cea59b7 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/RpgRocketModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/RpgRocketModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/SenpaiModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java
similarity index 92%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/SenpaiModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java
index b6e4f6234..d90e493a2 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/SenpaiModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/SenpaiModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.SenpaiEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/TargetModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java
similarity index 93%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/TargetModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java
index 45daacc89..23de434cb 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/TargetModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TargetModel.java
@@ -1,7 +1,7 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
-import com.atsuishio.superbwarfare.entity.TargetEntity;
 import com.atsuishio.superbwarfare.ModUtils;
+import com.atsuishio.superbwarfare.entity.TargetEntity;
 import net.minecraft.resources.ResourceLocation;
 import software.bernie.geckolib.model.GeoModel;
 
diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/model/TaserBulletProjectileModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java
similarity index 93%
rename from src/main/java/com/atsuishio/superbwarfare/entity/model/TaserBulletProjectileModel.java
rename to src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java
index 08a7941dc..1170508fb 100644
--- a/src/main/java/com/atsuishio/superbwarfare/entity/model/TaserBulletProjectileModel.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/TaserBulletProjectileModel.java
@@ -1,4 +1,4 @@
-package com.atsuishio.superbwarfare.entity.model;
+package com.atsuishio.superbwarfare.client.model.entity;
 
 import com.atsuishio.superbwarfare.ModUtils;
 import com.atsuishio.superbwarfare.entity.projectile.TaserBulletProjectileEntity;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/CannonShellRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/CannonShellRenderer.java
index 60402cbc2..7aef37e54 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/CannonShellRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/CannonShellRenderer.java
@@ -1,11 +1,11 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.layer.CannonShellLayer;
-import com.atsuishio.superbwarfare.entity.model.CannonShellEntityModel;
+import com.atsuishio.superbwarfare.client.layer.CannonShellLayer;
+import com.atsuishio.superbwarfare.client.model.entity.CannonShellEntityModel;
+import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
-import com.atsuishio.superbwarfare.entity.projectile.CannonShellEntity;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ClaymoreRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ClaymoreRenderer.java
index 00bb353a8..ea5e3bb1f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ClaymoreRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ClaymoreRenderer.java
@@ -1,7 +1,7 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
+import com.atsuishio.superbwarfare.client.model.entity.ClaymoreModel;
 import com.atsuishio.superbwarfare.entity.ClaymoreEntity;
-import com.atsuishio.superbwarfare.entity.model.ClaymoreModel;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java
index 3e3de5b72..313046363 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/DroneRenderer.java
@@ -1,10 +1,10 @@
 
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.model.DroneModel;
+import com.atsuishio.superbwarfare.client.model.entity.DroneModel;
+import com.atsuishio.superbwarfare.entity.DroneEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.atsuishio.superbwarfare.entity.DroneEntity;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/GunGrenadeRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/GunGrenadeRenderer.java
index f060a47eb..580cfd9cd 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/GunGrenadeRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/GunGrenadeRenderer.java
@@ -1,7 +1,7 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.layer.GunGrenadeLayer;
-import com.atsuishio.superbwarfare.entity.model.GunGrenadeModel;
+import com.atsuishio.superbwarfare.client.layer.GunGrenadeLayer;
+import com.atsuishio.superbwarfare.client.model.entity.GunGrenadeModel;
 import com.atsuishio.superbwarfare.entity.projectile.GunGrenadeEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/HandGrenadeRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/HandGrenadeRenderer.java
index 045c1cb36..38471e60b 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/HandGrenadeRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/HandGrenadeRenderer.java
@@ -1,6 +1,6 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.model.HandGrenadeEntityModel;
+import com.atsuishio.superbwarfare.client.model.entity.HandGrenadeEntityModel;
 import com.atsuishio.superbwarfare.entity.projectile.HandGrenadeEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/JavelinMissileRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/JavelinMissileRenderer.java
index e9c3423d7..45216a0fd 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/JavelinMissileRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/JavelinMissileRenderer.java
@@ -1,7 +1,7 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.layer.JavelinMissleLayer;
-import com.atsuishio.superbwarfare.entity.model.JavelinMissileModel;
+import com.atsuishio.superbwarfare.client.layer.JavelinMissleLayer;
+import com.atsuishio.superbwarfare.client.model.entity.JavelinMissileModel;
 import com.atsuishio.superbwarfare.entity.projectile.JavelinMissileEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java
index 0726906f0..2b3274f2d 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mk42Renderer.java
@@ -1,9 +1,9 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
+import com.atsuishio.superbwarfare.client.layer.Mk42DamageLayer;
+import com.atsuishio.superbwarfare.client.layer.Mk42Layer;
+import com.atsuishio.superbwarfare.client.model.entity.Mk42Model;
 import com.atsuishio.superbwarfare.entity.Mk42Entity;
-import com.atsuishio.superbwarfare.entity.layer.Mk42DamageLayer;
-import com.atsuishio.superbwarfare.entity.layer.Mk42Layer;
-import com.atsuishio.superbwarfare.entity.model.Mk42Model;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java
index a8efd0aa4..f4ae2b95b 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/Mle1934Renderer.java
@@ -1,9 +1,9 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
+import com.atsuishio.superbwarfare.client.layer.Mle1934DamageLayer;
+import com.atsuishio.superbwarfare.client.layer.Mle1934Layer;
+import com.atsuishio.superbwarfare.client.model.entity.Mle1934Model;
 import com.atsuishio.superbwarfare.entity.Mle1934Entity;
-import com.atsuishio.superbwarfare.entity.layer.Mle1934DamageLayer;
-import com.atsuishio.superbwarfare.entity.layer.Mle1934Layer;
-import com.atsuishio.superbwarfare.entity.model.Mle1934Model;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarRenderer.java
index 500c48891..e94f9082f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarRenderer.java
@@ -1,11 +1,11 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.layer.MortarLayer;
-import com.atsuishio.superbwarfare.entity.model.MortarModel;
+import com.atsuishio.superbwarfare.client.layer.MortarLayer;
+import com.atsuishio.superbwarfare.client.model.entity.MortarModel;
+import com.atsuishio.superbwarfare.entity.MortarEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.mojang.math.Axis;
-import com.atsuishio.superbwarfare.entity.MortarEntity;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarShellRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarShellRenderer.java
index d7c2f6bcf..087003450 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarShellRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/MortarShellRenderer.java
@@ -1,6 +1,6 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.model.MortarShellEntityModel;
+import com.atsuishio.superbwarfare.client.model.entity.MortarShellEntityModel;
 import com.atsuishio.superbwarfare.entity.projectile.MortarShellEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ProjectileEntityRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ProjectileEntityRenderer.java
index f786fb0d8..82c77c0b0 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ProjectileEntityRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/ProjectileEntityRenderer.java
@@ -1,8 +1,8 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.layer.ProjectileEntityInsideLayer;
-import com.atsuishio.superbwarfare.entity.layer.ProjectileEntityLayer;
-import com.atsuishio.superbwarfare.entity.model.ProjectileEntityModel;
+import com.atsuishio.superbwarfare.client.layer.ProjectileEntityInsideLayer;
+import com.atsuishio.superbwarfare.client.layer.ProjectileEntityLayer;
+import com.atsuishio.superbwarfare.client.model.entity.ProjectileEntityModel;
 import com.atsuishio.superbwarfare.entity.projectile.ProjectileEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RgoGrenadeRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RgoGrenadeRenderer.java
index 735d15810..3e7d2c05f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RgoGrenadeRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RgoGrenadeRenderer.java
@@ -1,6 +1,6 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.model.RgoGrenadeEntityModel;
+import com.atsuishio.superbwarfare.client.model.entity.RgoGrenadeEntityModel;
 import com.atsuishio.superbwarfare.entity.projectile.RgoGrenadeEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RpgRocketRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RpgRocketRenderer.java
index 8379091b9..638463b7c 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RpgRocketRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/RpgRocketRenderer.java
@@ -1,7 +1,7 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.layer.RpgRocketLayer;
-import com.atsuishio.superbwarfare.entity.model.RpgRocketModel;
+import com.atsuishio.superbwarfare.client.layer.RpgRocketLayer;
+import com.atsuishio.superbwarfare.client.model.entity.RpgRocketModel;
 import com.atsuishio.superbwarfare.entity.projectile.RpgRocketEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SenpaiRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SenpaiRenderer.java
index e8afafeae..374cbb55f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SenpaiRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/SenpaiRenderer.java
@@ -1,9 +1,9 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.model.SenpaiModel;
+import com.atsuishio.superbwarfare.client.model.entity.SenpaiModel;
+import com.atsuishio.superbwarfare.entity.SenpaiEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.atsuishio.superbwarfare.entity.SenpaiEntity;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TargetRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TargetRenderer.java
index 9296cf520..263cf6696 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TargetRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TargetRenderer.java
@@ -1,10 +1,10 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
+import com.atsuishio.superbwarfare.client.layer.TargetLayer;
+import com.atsuishio.superbwarfare.client.model.entity.TargetModel;
+import com.atsuishio.superbwarfare.entity.TargetEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.atsuishio.superbwarfare.entity.TargetEntity;
-import com.atsuishio.superbwarfare.entity.layer.TargetLayer;
-import com.atsuishio.superbwarfare.entity.model.TargetModel;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TaserBulletProjectileRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TaserBulletProjectileRenderer.java
index dc91b2d1a..f9603dab8 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TaserBulletProjectileRenderer.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/entity/TaserBulletProjectileRenderer.java
@@ -1,6 +1,6 @@
 package com.atsuishio.superbwarfare.client.renderer.entity;
 
-import com.atsuishio.superbwarfare.entity.model.TaserBulletProjectileModel;
+import com.atsuishio.superbwarfare.client.model.entity.TaserBulletProjectileModel;
 import com.atsuishio.superbwarfare.entity.projectile.TaserBulletProjectileEntity;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;