diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml
index 718da2cbc9..8564297371 100644
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -74,7 +74,7 @@ TileSets:
 
 Weapons:
 	cnc|weapons/explosions.yaml
-	cnc|weapons/largecaliber.yaml
+	cnc|weapons/ballistics.yaml
 	cnc|weapons/missiles.yaml
 	cnc|weapons/other.yaml
 	cnc|weapons/smallcaliber.yaml
diff --git a/mods/cnc/weapons/largecaliber.yaml b/mods/cnc/weapons/ballistics.yaml
similarity index 77%
rename from mods/cnc/weapons/largecaliber.yaml
rename to mods/cnc/weapons/ballistics.yaml
index cfa0377898..5f2f5b0669 100644
--- a/mods/cnc/weapons/largecaliber.yaml
+++ b/mods/cnc/weapons/ballistics.yaml
@@ -81,3 +81,26 @@ ArtilleryShell:
 	Warhead@3Eff: CreateEffect
 		Explosions: poof
 		ImpactSounds: xplosml2.aud
+
+Grenade:
+	Inherits: ^BallisticWeapon
+	ReloadDelay: 50
+	Range: 4c0
+	Report: toss1.aud
+	Projectile: Bullet
+		Speed: 140
+		Blockable: false
+		LaunchAngle: 62
+		Inaccuracy: 813
+		Image: BOMB
+	Warhead@1Dam: SpreadDamage
+		Spread: 341
+		Damage: 50
+		Versus:
+			None: 100
+			Wood: 50
+			Light: 80
+			Heavy: 35
+		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
+	Warhead@3Eff: CreateEffect
+		Explosions: small_poof
diff --git a/mods/cnc/weapons/explosions.yaml b/mods/cnc/weapons/explosions.yaml
index a780b9baf2..e3165297e8 100644
--- a/mods/cnc/weapons/explosions.yaml
+++ b/mods/cnc/weapons/explosions.yaml
@@ -99,3 +99,17 @@ Napalm.Crate:
 		ImpactSounds: flamer2.aud
 	Warhead@3Smu: LeaveSmudge
 		SmudgeType: Scorch
+
+TiberiumExplosion:
+	Inherits: ^DamagingExplosionHE
+	Warhead@1Dam: SpreadDamage
+		Spread: 9
+		Damage: 10
+		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
+	Warhead@2Eff: CreateEffect
+		Explosions: chemball
+		ImpactSounds: xplosml2.aud
+	-Warhead@3Smu: LeaveSmudge
+	Warhead@4Res: CreateResource
+		AddsResourceType: Tiberium
+		Size: 1,1
diff --git a/mods/cnc/weapons/other.yaml b/mods/cnc/weapons/other.yaml
index f0cb391bea..db090317b4 100644
--- a/mods/cnc/weapons/other.yaml
+++ b/mods/cnc/weapons/other.yaml
@@ -44,53 +44,24 @@ BigFlamer:
 		Explosions: med_napalm
 
 Chemspray:
+	Inherits: ^FlameWeapon
 	ReloadDelay: 65
 	Range: 3c0
-	Report: flamer2.aud
-	Projectile: Bullet
-		Speed: 1c682
+	InvalidTargets:
 	Warhead@1Dam: SpreadDamage
 		Spread: 256
 		Damage: 80
+		InvalidTargets:
 		Versus:
 			None: 70
 			Wood: 35
 			Light: 75
 			Heavy: 75
 		DamageTypes: Prone50Percent, TriggerProne, TiberiumDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
 	Warhead@3Eff: CreateEffect
 		Explosions: chemball
 		ImpactSounds: xplos.aud
 
-Grenade:
-	ReloadDelay: 50
-	Range: 4c0
-	Report: toss1.aud
-	Projectile: Bullet
-		Speed: 140
-		Blockable: false
-		LaunchAngle: 62
-		Inaccuracy: 813
-		Image: BOMB
-	Warhead@1Dam: SpreadDamage
-		Spread: 341
-		Damage: 50
-		Versus:
-			None: 100
-			Wood: 50
-			Light: 80
-			Heavy: 35
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Smu: LeaveSmudge
-		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
-	Warhead@3Eff: CreateEffect
-		Explosions: small_poof
-		ImpactSounds: xplos.aud
-
 Napalm:
 	Inherits: ^FlameWeapon
 	ReloadDelay: 4
@@ -126,23 +97,6 @@ Laser:
 		SmudgeType: Scorch
 		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees, Creep
 
-TiberiumExplosion:
-	Warhead@1Dam: SpreadDamage
-		Spread: 9
-		Damage: 10
-		Versus:
-			None: 90
-			Wood: 75
-			Light: 60
-			Heavy: 25
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Res: CreateResource
-		AddsResourceType: Tiberium
-		Size: 1,1
-	Warhead@3Eff: CreateEffect
-		Explosions: chemball
-		ImpactSounds: xplosml2.aud
-
 ^DinoWeapon:
 	ReloadDelay: 30
 	Range: 1c0
diff --git a/mods/cnc/weapons/smallcaliber.yaml b/mods/cnc/weapons/smallcaliber.yaml
index b99200bd91..2b5f667d88 100644
--- a/mods/cnc/weapons/smallcaliber.yaml
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -33,6 +33,18 @@ Sniper:
 HighV:
 	Inherits: ^HeavyMG
 
+Vulcan:
+	Inherits: ^HeavyMG
+	ReloadDelay: 2
+	Report: gun5.aud
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 100
+		Versus:
+			Wood: 25
+			Light: 100
+			Heavy: 35
+
 HeliAGGun:
 	Inherits: ^HeavyMG
 	ReloadDelay: 20
@@ -101,19 +113,6 @@ MachineGun:
 	Warhead@2Eff: CreateEffect
 		Explosions: piffs
 
-Vulcan:
-	Inherits: ^HeavyMG
-	ReloadDelay: 2
-	Report: gun5.aud
-	Warhead@1Dam: SpreadDamage
-		Spread: 426
-		Damage: 100
-		Versus:
-			None: 100
-			Wood: 25
-			Light: 100
-			Heavy: 35
-
 APCGun:
 	ReloadDelay: 18
 	Range: 5c0