diff --git a/zpak001.pk3dir/cfg/skill_scihunt.cfg b/zpak001.pk3dir/cfg/skill_scihunt.cfg
index 373e033..fecef6e 100644
--- a/zpak001.pk3dir/cfg/skill_scihunt.cfg
+++ b/zpak001.pk3dir/cfg/skill_scihunt.cfg
@@ -1,17 +1,21 @@
 exec skill_valve.cfg
 
-set sk_plr_hammer1 "50"
-set sk_plr_hammer2 "50"
-set sk_plr_hammer3 "50"
-
-set sk_plr_hammeralt1 "200"
-set sk_plr_hammeralt2 "200"
-set sk_plr_hammeralt3 "200"
-
 set sk_plr_chainsaw1 "10"
 set sk_plr_chainsaw2 "10"
 set sk_plr_chainsaw3 "10"
 
+set sk_plr_hammer1 "50"
+set sk_plr_hammer2 "50"
+set sk_plr_hammer3 "50"
+
+set sk_plr_hammer_alt1 "200"
+set sk_plr_hammer_alt2 "200"
+set sk_plr_hammer_alt3 "200"
+
 set sk_plr_handcannon1 "5"
 set sk_plr_handcannon2 "5"
 set sk_plr_handcannon3 "5"
+
+set sk_plr_needle1 "5"
+set sk_plr_needle2 "5"
+set sk_plr_needle3 "5"
\ No newline at end of file
diff --git a/zpak001.pk3dir/def/monsters/scientist.def b/zpak001.pk3dir/decls/def/monsters/scientist.def
similarity index 100%
rename from zpak001.pk3dir/def/monsters/scientist.def
rename to zpak001.pk3dir/decls/def/monsters/scientist.def
diff --git a/zpak001.pk3dir/def/player.def b/zpak001.pk3dir/decls/def/player.def
similarity index 100%
rename from zpak001.pk3dir/def/player.def
rename to zpak001.pk3dir/decls/def/player.def
diff --git a/zpak001.pk3dir/def/spawns.def b/zpak001.pk3dir/decls/def/spawns.def
similarity index 100%
rename from zpak001.pk3dir/def/spawns.def
rename to zpak001.pk3dir/decls/def/spawns.def
diff --git a/zpak001.pk3dir/def/weapons.def b/zpak001.pk3dir/decls/def/weapons.def
similarity index 100%
rename from zpak001.pk3dir/def/weapons.def
rename to zpak001.pk3dir/decls/def/weapons.def
diff --git a/zpak001.pk3dir/def/weapons/chainsaw.def b/zpak001.pk3dir/decls/def/weapons/chainsaw.def
similarity index 93%
rename from zpak001.pk3dir/def/weapons/chainsaw.def
rename to zpak001.pk3dir/decls/def/weapons/chainsaw.def
index d39936e..2474ca9 100644
--- a/zpak001.pk3dir/def/weapons/chainsaw.def
+++ b/zpak001.pk3dir/decls/def/weapons/chainsaw.def
@@ -12,6 +12,8 @@ entityDef weapon_chainsaw
 	"snd_acquire"		"weapon.pickup"
 	"snd_respawn"		"item.respawn"
 	"snd_idle"			"weapon_chainsaw.idle"
+	"snd_start"			"weapon_chainsaw.start"
+	"snd_stop"			"weapon_chainsaw.stop"
 
 	// weapon specific
 	"def_melee"			"damage_chainsaw"
diff --git a/zpak001.pk3dir/def/weapons/hammer.def b/zpak001.pk3dir/decls/def/weapons/hammer.def
similarity index 93%
rename from zpak001.pk3dir/def/weapons/hammer.def
rename to zpak001.pk3dir/decls/def/weapons/hammer.def
index 25208d8..964f8ce 100644
--- a/zpak001.pk3dir/def/weapons/hammer.def
+++ b/zpak001.pk3dir/decls/def/weapons/hammer.def
@@ -11,7 +11,6 @@ entityDef weapon_hammer
 	"model_view"		"models/v_hammer.mdl"
 	"snd_acquire"		"weapon.pickup"
 	"snd_respawn"		"item.respawn"
-	"snd_idle"			"weapon_hammer.idle"
 	"snd_hit"			"weapon_hammer.hit"
 	"snd_miss"			"weapon_hammer.miss"
 
@@ -22,16 +21,10 @@ entityDef weapon_hammer
 	"inv_name"			"Hammer"
 	"ammoType"			""
 	"ammoRequired"		"0"
-	"clipSize"			"0"
-
-	"meleeRateMiss"		"1.0"
-	"meleeRateHit"		"1.0"
 
 	"actIdle"			"0,5,6"
 	"actDraw"			"1"
 	"actHolster"		"2,7,8"
-	"actMeleeMiss"		"3"
-	"actMeleeHit"		"3"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
@@ -51,13 +44,19 @@ entityDef damage_hammer
 	"push"				"20000"
 	"gib"				"0"
 
+	"meleeRateMiss"		"1.0"
+	"meleeRateHit"		"1.0"
+	"actMeleeMiss"		"3"
+	"actMeleeHit"		"3"
+
 }
 
 // TODO
 entityDef damage_hammerWindup
 {
-	"damage"			"skill:plr_hammeralt"
+	"damage"			"skill:plr_hammer_alt"
 	"gib"				"1"
+
 	"meleeRateMiss"		"0.75"
 	"meleeRateHit"		"0.75"
 	"actMeleeMiss"		"4"
diff --git a/zpak001.pk3dir/def/weapons/handcannon.def b/zpak001.pk3dir/decls/def/weapons/handcannon.def
similarity index 100%
rename from zpak001.pk3dir/def/weapons/handcannon.def
rename to zpak001.pk3dir/decls/def/weapons/handcannon.def
diff --git a/zpak001.pk3dir/def/weapons/needle.def b/zpak001.pk3dir/decls/def/weapons/needle.def
similarity index 77%
rename from zpak001.pk3dir/def/weapons/needle.def
rename to zpak001.pk3dir/decls/def/weapons/needle.def
index 14a1aaa..98da962 100644
--- a/zpak001.pk3dir/def/weapons/needle.def
+++ b/zpak001.pk3dir/decls/def/weapons/needle.def
@@ -17,8 +17,7 @@ entityDef weapon_needle
 	"clipSize"			"0"
 
 	"meleeRateMiss"		"0.5"
-	"meleeRateHit"		"0.25"
-
+	"meleeRateHit"		"0.5"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
@@ -26,16 +25,13 @@ entityDef weapon_needle
 	"weight"		"0"
 	"crosshair"		"none"
 	"ammoIcon"		"none"
+	"icon"			"none"
+	"iconSelected"	"none"
 }
 
+// TODO needs infection
 entityDef damage_needle
 {
 	"damage"			"skill:plr_needle"
-//	"kickDir"			"-1 0 0"
-//	"knockback"			"20"
-//	"push"				"20000"
 	"gib"				"0"
-
-	"snd_hit"			"weapon_needle.hit"
-	"snd_miss"			"weapon_needle.miss"
 }
diff --git a/zpak001.pk3dir/sound/monster_scientist_scihunt.sndshd b/zpak001.pk3dir/decls/sound/monster_scientist_scihunt.sndshd
similarity index 100%
rename from zpak001.pk3dir/sound/monster_scientist_scihunt.sndshd
rename to zpak001.pk3dir/decls/sound/monster_scientist_scihunt.sndshd
diff --git a/zpak001.pk3dir/sound/player_scihunt.sndshd b/zpak001.pk3dir/decls/sound/player_scihunt.sndshd
similarity index 100%
rename from zpak001.pk3dir/sound/player_scihunt.sndshd
rename to zpak001.pk3dir/decls/sound/player_scihunt.sndshd
diff --git a/zpak001.pk3dir/sound/weapons_scihunt.sndshd b/zpak001.pk3dir/decls/sound/weapons_scihunt.sndshd
similarity index 92%
rename from zpak001.pk3dir/sound/weapons_scihunt.sndshd
rename to zpak001.pk3dir/decls/sound/weapons_scihunt.sndshd
index 025650b..4bd3d15 100644
--- a/zpak001.pk3dir/sound/weapons_scihunt.sndshd
+++ b/zpak001.pk3dir/decls/sound/weapons_scihunt.sndshd
@@ -3,11 +3,6 @@ weapon_handcannon.shoot
 	sample cannon/fire.wav
 }
 
-weapon_chainsaw.attack
-{
-	sample sh/chainsaw_idle2.wav
-}
-
 weapon_chainsaw.draw
 {
 	sample sh/chainsaw_pullout.wav
@@ -30,7 +25,12 @@ weapon_chainsaw.idle
 	sample sh/chainsaw_idle.wav
 }
 
-weapon_chainsaw.startup
+weapon_chainsaw.miss
+{
+	sample sh/chainsaw_idle2.wav
+}
+
+weapon_chainsaw.start
 {
 	sample sh/chainsaw_startup.wav
 }