diff --git a/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt b/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt
index eb16a33..91b57d3 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/Bde_particles.kt
@@ -4,7 +4,7 @@ import com.bytedice.bde_particles.commands.GiveEmitterTool
 import com.bytedice.bde_particles.commands.KillAllEmitters
 import com.bytedice.bde_particles.commands.ManageEmitters
 import com.bytedice.bde_particles.items.ParticleEmitterTool
-import com.bytedice.bde_particles.particleIdRegister.*
+import com.bytedice.bde_particles.particles.*
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.ModInitializer
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback
@@ -27,7 +27,6 @@ import net.minecraft.world.World
 import java.util.*
 
 
-// TODO: make it work client-side too
 // TODO: finish the particle ticking
 // TODO: make custom commands to create particles easier (only temporarily saved)
 
diff --git a/src/main/kotlin/com/bytedice/bde_particles/commands/GiveEmitterTool.kt b/src/main/kotlin/com/bytedice/bde_particles/commands/GiveEmitterTool.kt
index 6d0eb8e..31fdafd 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/commands/GiveEmitterTool.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/commands/GiveEmitterTool.kt
@@ -1,7 +1,7 @@
 package com.bytedice.bde_particles.commands
 
 import com.bytedice.bde_particles.items.ParticleEmitterTool
-import com.bytedice.bde_particles.particleIdRegister.emitterIdRegister
+import com.bytedice.bde_particles.particles.emitterIdRegister
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.StringArgumentType
diff --git a/src/main/kotlin/com/bytedice/bde_particles/commands/ManageConfigArgs.kt b/src/main/kotlin/com/bytedice/bde_particles/commands/ManageConfigArgs.kt
index 6e20da3..0ac2389 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/commands/ManageConfigArgs.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/commands/ManageConfigArgs.kt
@@ -1,8 +1,8 @@
 package com.bytedice.bde_particles.commands
 
 import com.bytedice.bde_particles.InterpolationCurves
-import com.bytedice.bde_particles.particleIdRegister.SpawningShape
-import com.bytedice.bde_particles.particleIdRegister.updateSingleParam
+import com.bytedice.bde_particles.particles.SpawningShape
+import com.bytedice.bde_particles.particles.updateSingleParam
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.arguments.BoolArgumentType
 import com.mojang.brigadier.arguments.FloatArgumentType
diff --git a/src/main/kotlin/com/bytedice/bde_particles/commands/ManageEmitters.kt b/src/main/kotlin/com/bytedice/bde_particles/commands/ManageEmitters.kt
index 3148cb8..2847d6c 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/commands/ManageEmitters.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/commands/ManageEmitters.kt
@@ -1,7 +1,7 @@
 package com.bytedice.bde_particles.commands
 
 import com.bytedice.bde_particles.emitterParamsToJson
-import com.bytedice.bde_particles.particleIdRegister.*
+import com.bytedice.bde_particles.particles.*
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.CommandDispatcher
 import com.mojang.brigadier.arguments.IntegerArgumentType
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/EmitterParams.kt b/src/main/kotlin/com/bytedice/bde_particles/particles/EmitterParams.kt
similarity index 96%
rename from src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/EmitterParams.kt
rename to src/main/kotlin/com/bytedice/bde_particles/particles/EmitterParams.kt
index bd736f9..41eb314 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/EmitterParams.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particles/EmitterParams.kt
@@ -1,4 +1,4 @@
-package com.bytedice.bde_particles.particleIdRegister
+package com.bytedice.bde_particles.particles
 
 /**
  * EmitterParams defines the parameters for controlling how particles are emitted,
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ForceFields.kt b/src/main/kotlin/com/bytedice/bde_particles/particles/ForceFields.kt
similarity index 84%
rename from src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ForceFields.kt
rename to src/main/kotlin/com/bytedice/bde_particles/particles/ForceFields.kt
index ae093e0..35bf47d 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ForceFields.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particles/ForceFields.kt
@@ -1,4 +1,4 @@
-package com.bytedice.bde_particles.particleIdRegister
+package com.bytedice.bde_particles.particles
 
 data class ForceField (
   val x:        Float           = 0.0f,
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/Particle.kt b/src/main/kotlin/com/bytedice/bde_particles/particles/Particle.kt
similarity index 99%
rename from src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/Particle.kt
rename to src/main/kotlin/com/bytedice/bde_particles/particles/Particle.kt
index 835519f..cb97c23 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/Particle.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particles/Particle.kt
@@ -1,4 +1,4 @@
-package com.bytedice.bde_particles.particleIdRegister
+package com.bytedice.bde_particles.particles
 
 import com.bytedice.bde_particles.*
 import net.minecraft.server.world.ServerWorld
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleEmitter.kt b/src/main/kotlin/com/bytedice/bde_particles/particles/ParticleEmitter.kt
similarity index 98%
rename from src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleEmitter.kt
rename to src/main/kotlin/com/bytedice/bde_particles/particles/ParticleEmitter.kt
index ddeea47..6dbfeeb 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleEmitter.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particles/ParticleEmitter.kt
@@ -1,4 +1,4 @@
-package com.bytedice.bde_particles.particleIdRegister
+package com.bytedice.bde_particles.particles
 
 import net.minecraft.server.world.ServerWorld
 import net.minecraft.util.math.Vec3d
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleIdRegister.kt b/src/main/kotlin/com/bytedice/bde_particles/particles/ParticleIdRegister.kt
similarity index 98%
rename from src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleIdRegister.kt
rename to src/main/kotlin/com/bytedice/bde_particles/particles/ParticleIdRegister.kt
index 0b576db..1cb1682 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleIdRegister.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particles/ParticleIdRegister.kt
@@ -1,6 +1,6 @@
 @file:Suppress("UNCHECKED_CAST")
 
-package com.bytedice.bde_particles.particleIdRegister
+package com.bytedice.bde_particles.particles
 
 import com.bytedice.bde_particles.InterpolationCurves
 import org.joml.Vector3f
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleParams.kt b/src/main/kotlin/com/bytedice/bde_particles/particles/ParticleParams.kt
similarity index 98%
rename from src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleParams.kt
rename to src/main/kotlin/com/bytedice/bde_particles/particles/ParticleParams.kt
index 413a7a7..f6e7a49 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/ParticleParams.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particles/ParticleParams.kt
@@ -1,4 +1,4 @@
-package com.bytedice.bde_particles.particleIdRegister
+package com.bytedice.bde_particles.particles
 
 import com.bytedice.bde_particles.InterpolationCurves
 import org.joml.Vector3f
diff --git a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/Shapes.kt b/src/main/kotlin/com/bytedice/bde_particles/particles/Shapes.kt
similarity index 93%
rename from src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/Shapes.kt
rename to src/main/kotlin/com/bytedice/bde_particles/particles/Shapes.kt
index 66a6841..371cd07 100644
--- a/src/main/kotlin/com/bytedice/bde_particles/particleIdRegister/Shapes.kt
+++ b/src/main/kotlin/com/bytedice/bde_particles/particles/Shapes.kt
@@ -1,4 +1,4 @@
-package com.bytedice.bde_particles.particleIdRegister
+package com.bytedice.bde_particles.particles
 
 import org.joml.Vector2f
 import org.joml.Vector3f