diff --git a/resources/assets/tinker/sounds/Credits.txt b/resources/assets/tinker/sounds/Credits.txt
new file mode 100644
index 00000000..a22f86fa
--- /dev/null
+++ b/resources/assets/tinker/sounds/Credits.txt
@@ -0,0 +1,9 @@
+Stone-Hit:
+Pickaxe mining stone by ryanconway
+https://www.freesound.org/people/ryanconway/sounds/240801/
+metal falling on stone by p3n10
+https://www.freesound.org/people/p3n10/sounds/171294/
+
+Wood-Hit:
+Hitting Wood by altfuture
+https://www.freesound.org/people/altfuture/sounds/174633/
\ No newline at end of file
diff --git a/resources/assets/tinker/sounds/stoneHit1.ogg b/resources/assets/tinker/sounds/stoneHit1.ogg
new file mode 100644
index 00000000..04fe1bee
Binary files /dev/null and b/resources/assets/tinker/sounds/stoneHit1.ogg differ
diff --git a/resources/assets/tinker/sounds/stoneHit2.ogg b/resources/assets/tinker/sounds/stoneHit2.ogg
new file mode 100644
index 00000000..68ee1881
Binary files /dev/null and b/resources/assets/tinker/sounds/stoneHit2.ogg differ
diff --git a/resources/assets/tinker/sounds/stoneHit3.ogg b/resources/assets/tinker/sounds/stoneHit3.ogg
new file mode 100644
index 00000000..057eddfa
Binary files /dev/null and b/resources/assets/tinker/sounds/stoneHit3.ogg differ
diff --git a/resources/assets/tinker/sounds/woodHit1.ogg b/resources/assets/tinker/sounds/woodHit1.ogg
new file mode 100644
index 00000000..f978b0b8
Binary files /dev/null and b/resources/assets/tinker/sounds/woodHit1.ogg differ
diff --git a/resources/assets/tinker/sounds/woodHit2.ogg b/resources/assets/tinker/sounds/woodHit2.ogg
new file mode 100644
index 00000000..339ae097
Binary files /dev/null and b/resources/assets/tinker/sounds/woodHit2.ogg differ
diff --git a/resources/assets/tinker/sounds/woodHit3.ogg b/resources/assets/tinker/sounds/woodHit3.ogg
new file mode 100644
index 00000000..3b24d95b
Binary files /dev/null and b/resources/assets/tinker/sounds/woodHit3.ogg differ
diff --git a/resources/assets/tinker/sounds/woodHit4.ogg b/resources/assets/tinker/sounds/woodHit4.ogg
new file mode 100644
index 00000000..06279c66
Binary files /dev/null and b/resources/assets/tinker/sounds/woodHit4.ogg differ
diff --git a/resources/assets/tinker/sounds/woodHit5.ogg b/resources/assets/tinker/sounds/woodHit5.ogg
new file mode 100644
index 00000000..7b27b5f0
Binary files /dev/null and b/resources/assets/tinker/sounds/woodHit5.ogg differ
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
index 541bf256..fc704cef 100644
--- a/src/main/java/tconstruct/TConstruct.java
+++ b/src/main/java/tconstruct/TConstruct.java
@@ -41,6 +41,7 @@ import tconstruct.util.IMCHandler;
 import tconstruct.util.config.DimensionBlacklist;
 import tconstruct.util.config.PHConstruct;
 import tconstruct.util.network.PacketPipeline;
+import tconstruct.weaponry.TinkerWeaponry;
 import tconstruct.world.TinkerWorld;
 import tconstruct.world.gen.SlimeIslandGen;
 import tconstruct.world.village.ComponentSmeltery;
@@ -127,6 +128,7 @@ public class TConstruct
         pulsar.registerPulse(new TinkerSmeltery());
         pulsar.registerPulse(new TinkerMechworks());
         pulsar.registerPulse(new TinkerArmor());
+        pulsar.registerPulse(new TinkerWeaponry());
         pulsar.registerPulse(new TinkerThaumcraft());
         pulsar.registerPulse(new TinkerWaila());
         pulsar.registerPulse(new TinkerBuildCraft());
diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java
index d0cfce04..35bd2392 100644
--- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java
+++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java
@@ -1,29 +1,20 @@
-package boni.tinkersweaponry;
+package tconstruct.weaponry;
+
 
-import boni.tinkersweaponry.ammo.ArrowAmmo;
-import boni.tinkersweaponry.ammo.BoltAmmo;
-import boni.tinkersweaponry.items.DualMaterialToolPart;
-import boni.tinkersweaponry.items.WeaponryPattern;
-import boni.tinkersweaponry.items.WeaponryToolPart;
-import boni.tinkersweaponry.library.weaponry.AmmoItem;
-import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
-import boni.tinkersweaponry.library.weaponry.ArrowShaftMaterial;
-import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
-import boni.tinkersweaponry.util.Reference;
-import boni.tinkersweaponry.weapons.*;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
-import org.apache.logging.log4j.Logger;
 import tconstruct.TConstruct;
 import tconstruct.library.TConstructCreativeTab;
 import tconstruct.library.TConstructRegistry;
@@ -34,21 +25,26 @@ import tconstruct.library.util.IToolPart;
 import tconstruct.smeltery.TinkerSmeltery;
 import tconstruct.tools.TinkerTools;
 import tconstruct.tools.items.Pattern;
+import tconstruct.weaponry.ammo.ArrowAmmo;
+import tconstruct.weaponry.ammo.BoltAmmo;
+import tconstruct.weaponry.items.DualMaterialToolPart;
+import tconstruct.weaponry.items.WeaponryPattern;
+import tconstruct.weaponry.items.WeaponryToolPart;
+import tconstruct.weaponry.library.weaponry.AmmoItem;
+import tconstruct.weaponry.library.weaponry.AmmoWeapon;
+import tconstruct.weaponry.library.weaponry.ArrowShaftMaterial;
+import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
+import tconstruct.weaponry.weapons.*;
 
 import java.util.Map;
 import java.util.Random;
 
 import static tconstruct.tools.TinkerTools.MaterialID;
 
-@GameRegistry.ObjectHolder(Reference.MOD_ID)
-@Mod(modid = Reference.MOD_ID, name = Reference.MOD_NAME, dependencies = "required-after:" + Reference.TCON_MOD_ID, version = "${version}")
+@GameRegistry.ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers' Weaponry", description = "The main core of the mod! All of the tools, the tables, and the patterns are here.", pulsesRequired="Tinkers' Tools")
 public class TinkerWeaponry {
-    public static Logger Log;
-
-    @Mod.Instance(Reference.MOD_ID)
-    public static TinkerWeaponry instance;
-
-    @SidedProxy(clientSide = "boni.tinkersweaponry.ClientProxy", serverSide = "boni.tinkersweaponry.CommonProxy")
+    @SidedProxy(clientSide = "tconstruct.weaponry.WeaponryClientProxy", serverSide = "tconstruct.weaponry.WeaponryCommonProxy")
     public static WeaponryCommonProxy proxy;
 
     // Throwing Weapons
@@ -83,16 +79,14 @@ public class TinkerWeaponry {
     public static Random random = new Random();
 
 
-    @Mod.EventHandler
+    @Handler
     public void preInit(FMLPreInitializationEvent event)
     {
-        Log = event.getModLog();
-
         registerItems();
         registerMaterials();
     }
 
-    @Mod.EventHandler
+    @Handler
     public void init(FMLInitializationEvent event)
     {
         addPartRecipies();
@@ -100,7 +94,7 @@ public class TinkerWeaponry {
         registerBoltCasting();
     }
 
-    @Mod.EventHandler
+    @Handler
     public void postInit(FMLPostInitializationEvent event)
     {
         // this handler takes care that ammo weapons get ammo.
@@ -208,7 +202,7 @@ public class TinkerWeaponry {
         // Bow Materials: Material ID, durability, drawspeed, arrow speed
         // speed 3.0 == exactly the vanilla bow if 2 parts of speed 3 are used
         // Wooden stuff is flexible, therefore good
-        TConstructRegistry.addBowMaterial(MaterialID.Wood,      0, 18, 3.0f); // Wood
+        TConstructRegistry.addBowMaterial(TinkerTools.MaterialID.Wood,      0, 18, 3.0f); // Wood
         // other organic materials also are good
         TConstructRegistry.addBowMaterial(MaterialID.Cactus,    0, 20, 2.4f); // Cactus
         TConstructRegistry.addBowMaterial(MaterialID.Bone,      0, 38, 2.0f); // Bone
@@ -253,7 +247,7 @@ public class TinkerWeaponry {
         TConstructRegistry.addArrowMaterial(MaterialID.PigIron,     3.6F,   0.5F,  100F); //Pigiron
 
         // Arrow Shaft Materials: Material ID, crafting item, durability-medifier, mass, fragility
-        TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(0, Items.stick,     1.0f,  1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance
+        TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(0, Items.stick, 1.0f, 1.0f, 0.15f, 0x866526)); // wood: reference material, 10% break chance
         TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(1, Items.bone,      0.95f, 1.2f, 0.05f, 0xede6bf)); // bone: heavier, but durable
         TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(2, Items.reeds,     1.5f,  0.8f, 0.66f, 0xc7ff87)); // reed: light, but less durable
         TConstructRegistry.addCustomMaterial(ArrowShaftMaterial.createMaterial(3, Items.blaze_rod, 1.2f,  0.9f, 0.08f, 0xfff32d)); // blaze: tad lighter, tad more durable, fieryyyy
diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java
index 95ed639e..6588cd56 100644
--- a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java
+++ b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java
@@ -1,15 +1,15 @@
-package boni.tinkersweaponry;
+package tconstruct.weaponry;
 
-import boni.tinkersweaponry.client.AmmoSlotHandler;
-import boni.tinkersweaponry.client.CrosshairHandler;
-import boni.tinkersweaponry.client.RenderEventHandler;
-import boni.tinkersweaponry.client.entityrenderer.ArrowEntityRenderer;
-import boni.tinkersweaponry.client.entityrenderer.JavelinEntityRenderer;
-import boni.tinkersweaponry.client.entityrenderer.ProjectileBaseRenderer;
-import boni.tinkersweaponry.client.entityrenderer.ShurikenEntityRenderer;
-import boni.tinkersweaponry.client.renderer.*;
-import boni.tinkersweaponry.entity.*;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.client.AmmoSlotHandler;
+import tconstruct.weaponry.client.CrosshairHandler;
+import tconstruct.weaponry.client.RenderEventHandler;
+import tconstruct.weaponry.client.entityrenderer.ArrowEntityRenderer;
+import tconstruct.weaponry.client.entityrenderer.JavelinEntityRenderer;
+import tconstruct.weaponry.client.entityrenderer.ProjectileBaseRenderer;
+import tconstruct.weaponry.client.entityrenderer.ShurikenEntityRenderer;
+import tconstruct.weaponry.client.renderer.*;
+import tconstruct.weaponry.entity.*;
+import tconstruct.weaponry.util.Reference;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.MinecraftForgeClient;
diff --git a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java
index caad6061..4fb65e8d 100644
--- a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java
+++ b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java
@@ -1,14 +1,15 @@
-package boni.tinkersweaponry;
+package tconstruct.weaponry;
 
-import boni.tinkersweaponry.entity.*;
+import tconstruct.TConstruct;
+import tconstruct.weaponry.entity.*;
 import cpw.mods.fml.common.registry.EntityRegistry;
 
 public class WeaponryCommonProxy {
     public void init() {
-        EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 0, TinkerWeaponry.instance, 32, 5, true);
-        EntityRegistry.registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 1, TinkerWeaponry.instance, 32, 5, true);
-        EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 2, TinkerWeaponry.instance, 32, 5, true);
-        EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 3, TinkerWeaponry.instance, 32, 5, true);
-        EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 4, TinkerWeaponry.instance, 32, 5, true);
+        EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 0, TConstruct.instance, 32, 5, true);
+        EntityRegistry.registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 1, TConstruct.instance, 32, 5, true);
+        EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 2, TConstruct.instance, 32, 5, true);
+        EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 3, TConstruct.instance, 32, 5, true);
+        EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 4, TConstruct.instance, 32, 5, true);
     }
 }
diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java
index 4936f36a..5c8b56ab 100644
--- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java
+++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java
@@ -1,13 +1,13 @@
-package boni.tinkersweaponry;
+package tconstruct.weaponry;
 
-import boni.tinkersweaponry.ammo.ArrowAmmo;
-import boni.tinkersweaponry.ammo.BoltAmmo;
-import boni.tinkersweaponry.items.DualMaterialToolPart;
-import boni.tinkersweaponry.library.weaponry.ArrowShaftMaterial;
-import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
-import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
-import boni.tinkersweaponry.library.weaponry.IAmmo;
-import boni.tinkersweaponry.weapons.Crossbow;
+import tconstruct.weaponry.ammo.ArrowAmmo;
+import tconstruct.weaponry.ammo.BoltAmmo;
+import tconstruct.weaponry.items.DualMaterialToolPart;
+import tconstruct.weaponry.library.weaponry.ArrowShaftMaterial;
+import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
+import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
+import tconstruct.weaponry.library.weaponry.IAmmo;
+import tconstruct.weaponry.weapons.Crossbow;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java
index d367ddc3..e68e47cf 100644
--- a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java
+++ b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java
@@ -1,8 +1,9 @@
-package boni.tinkersweaponry.ammo;
+package tconstruct.weaponry.ammo;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.library.weaponry.AmmoItem;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.TConstruct;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.library.weaponry.AmmoItem;
+import tconstruct.weaponry.util.Reference;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -119,6 +120,6 @@ public class ArrowAmmo extends AmmoItem {
             vanillaArrow = tool;
         }
         else
-            TinkerWeaponry.Log.error("Couldn't build vanilla equivalent of Tinker Arrow");
+            TConstruct.logger.error("Couldn't build vanilla equivalent of Tinker Arrow");
     }
 }
diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java
index 03c63e42..4d75989c 100644
--- a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java
+++ b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java
@@ -1,8 +1,8 @@
-package boni.tinkersweaponry.ammo;
+package tconstruct.weaponry.ammo;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.items.DualMaterialToolPart;
-import boni.tinkersweaponry.library.weaponry.AmmoItem;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.items.DualMaterialToolPart;
+import tconstruct.weaponry.library.weaponry.AmmoItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import tconstruct.library.crafting.ToolBuilder;
diff --git a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java
index 6b1d740e..1b1d3ba3 100644
--- a/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java
+++ b/src/main/java/tconstruct/weaponry/client/AmmoSlotHandler.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.client;
+package tconstruct.weaponry.client;
 
-import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
+import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java
index 304116da..6fe04498 100644
--- a/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java
+++ b/src/main/java/tconstruct/weaponry/client/CrosshairHandler.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.client;
+package tconstruct.weaponry.client;
 
-import boni.tinkersweaponry.util.Reference;
-import boni.tinkersweaponry.library.weaponry.IWindup;
+import tconstruct.weaponry.util.Reference;
+import tconstruct.weaponry.library.weaponry.IWindup;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
diff --git a/src/main/java/tconstruct/weaponry/client/CrosshairType.java b/src/main/java/tconstruct/weaponry/client/CrosshairType.java
index d747e2fb..5b9a4b77 100644
--- a/src/main/java/tconstruct/weaponry/client/CrosshairType.java
+++ b/src/main/java/tconstruct/weaponry/client/CrosshairType.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.client;
+package tconstruct.weaponry.client;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/tconstruct/weaponry/client/IconFlipped.java b/src/main/java/tconstruct/weaponry/client/IconFlipped.java
index 6201caf0..230c786d 100644
--- a/src/main/java/tconstruct/weaponry/client/IconFlipped.java
+++ b/src/main/java/tconstruct/weaponry/client/IconFlipped.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.client;
+package tconstruct.weaponry.client;
 
 import net.minecraft.util.IIcon;
 
diff --git a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java
index 00e350be..d68656fe 100644
--- a/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java
+++ b/src/main/java/tconstruct/weaponry/client/RenderEventHandler.java
@@ -1,8 +1,8 @@
-package boni.tinkersweaponry.client;
+package tconstruct.weaponry.client;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
-import boni.tinkersweaponry.library.weaponry.IWindup;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
+import tconstruct.weaponry.library.weaponry.IWindup;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.event.FOVUpdateEvent;
diff --git a/src/main/java/tconstruct/weaponry/client/entityrenderer/ArrowEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entityrenderer/ArrowEntityRenderer.java
index 7e7fe862..f0098ba4 100644
--- a/src/main/java/tconstruct/weaponry/client/entityrenderer/ArrowEntityRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/entityrenderer/ArrowEntityRenderer.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.client.entityrenderer;
+package tconstruct.weaponry.client.entityrenderer;
 
-import boni.tinkersweaponry.entity.ArrowEntity;
+import tconstruct.weaponry.entity.ArrowEntity;
 import org.lwjgl.opengl.GL11;
 
 public class ArrowEntityRenderer extends ProjectileBaseRenderer<ArrowEntity> {
diff --git a/src/main/java/tconstruct/weaponry/client/entityrenderer/JavelinEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entityrenderer/JavelinEntityRenderer.java
index 6e7c828a..b328e60e 100644
--- a/src/main/java/tconstruct/weaponry/client/entityrenderer/JavelinEntityRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/entityrenderer/JavelinEntityRenderer.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.client.entityrenderer;
+package tconstruct.weaponry.client.entityrenderer;
 
-import boni.tinkersweaponry.entity.JavelinEntity;
+import tconstruct.weaponry.entity.JavelinEntity;
 import org.lwjgl.opengl.GL11;
 
 public class JavelinEntityRenderer extends ProjectileBaseRenderer<JavelinEntity> {
diff --git a/src/main/java/tconstruct/weaponry/client/entityrenderer/ProjectileBaseRenderer.java b/src/main/java/tconstruct/weaponry/client/entityrenderer/ProjectileBaseRenderer.java
index f79c45c3..a4cc34ae 100644
--- a/src/main/java/tconstruct/weaponry/client/entityrenderer/ProjectileBaseRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/entityrenderer/ProjectileBaseRenderer.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.client.entityrenderer;
+package tconstruct.weaponry.client.entityrenderer;
 
-import boni.tinkersweaponry.client.renderer.FlexibleToolRenderer;
-import boni.tinkersweaponry.entity.ProjectileBase;
+import tconstruct.weaponry.client.renderer.FlexibleToolRenderer;
+import tconstruct.weaponry.entity.ProjectileBase;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/tconstruct/weaponry/client/entityrenderer/ShurikenEntityRenderer.java b/src/main/java/tconstruct/weaponry/client/entityrenderer/ShurikenEntityRenderer.java
index a2aa33f8..e085e1c7 100644
--- a/src/main/java/tconstruct/weaponry/client/entityrenderer/ShurikenEntityRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/entityrenderer/ShurikenEntityRenderer.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.client.entityrenderer;
+package tconstruct.weaponry.client.entityrenderer;
 
-import boni.tinkersweaponry.entity.ShurikenEntity;
+import tconstruct.weaponry.entity.ShurikenEntity;
 import org.lwjgl.opengl.GL11;
 
 public class ShurikenEntityRenderer extends ProjectileBaseRenderer<ShurikenEntity> {
diff --git a/src/main/java/tconstruct/weaponry/client/renderer/AmmoItemRenderer.java b/src/main/java/tconstruct/weaponry/client/renderer/AmmoItemRenderer.java
index 1763e3e1..e40ab1f4 100644
--- a/src/main/java/tconstruct/weaponry/client/renderer/AmmoItemRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/renderer/AmmoItemRenderer.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.client.renderer;
+package tconstruct.weaponry.client.renderer;
 
-import boni.tinkersweaponry.library.weaponry.IAmmo;
+import tconstruct.weaponry.library.weaponry.IAmmo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/client/renderer/BowRenderer.java b/src/main/java/tconstruct/weaponry/client/renderer/BowRenderer.java
index 089630c4..bec766b7 100644
--- a/src/main/java/tconstruct/weaponry/client/renderer/BowRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/renderer/BowRenderer.java
@@ -1,10 +1,10 @@
-package boni.tinkersweaponry.client.renderer;
+package tconstruct.weaponry.client.renderer;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.ammo.ArrowAmmo;
-import boni.tinkersweaponry.entity.ArrowEntity;
-import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
-import boni.tinkersweaponry.library.weaponry.IWindup;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.ammo.ArrowAmmo;
+import tconstruct.weaponry.entity.ArrowEntity;
+import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
+import tconstruct.weaponry.library.weaponry.IWindup;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
diff --git a/src/main/java/tconstruct/weaponry/client/renderer/CrossbowRenderer.java b/src/main/java/tconstruct/weaponry/client/renderer/CrossbowRenderer.java
index ecd0b5d2..1fc398fe 100644
--- a/src/main/java/tconstruct/weaponry/client/renderer/CrossbowRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/renderer/CrossbowRenderer.java
@@ -1,8 +1,8 @@
-package boni.tinkersweaponry.client.renderer;
+package tconstruct.weaponry.client.renderer;
 
-import boni.tinkersweaponry.entity.ArrowEntity;
-import boni.tinkersweaponry.entity.BoltEntity;
-import boni.tinkersweaponry.weapons.Crossbow;
+import tconstruct.weaponry.entity.ArrowEntity;
+import tconstruct.weaponry.entity.BoltEntity;
+import tconstruct.weaponry.weapons.Crossbow;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
diff --git a/src/main/java/tconstruct/weaponry/client/renderer/FlexibleToolRenderer.java b/src/main/java/tconstruct/weaponry/client/renderer/FlexibleToolRenderer.java
index dea43d0a..68f83922 100644
--- a/src/main/java/tconstruct/weaponry/client/renderer/FlexibleToolRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/renderer/FlexibleToolRenderer.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.client.renderer;
+package tconstruct.weaponry.client.renderer;
 
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/tconstruct/weaponry/client/renderer/JavelinRenderer.java b/src/main/java/tconstruct/weaponry/client/renderer/JavelinRenderer.java
index 966262d0..2f10315d 100644
--- a/src/main/java/tconstruct/weaponry/client/renderer/JavelinRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/renderer/JavelinRenderer.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.client.renderer;
+package tconstruct.weaponry.client.renderer;
 
-import boni.tinkersweaponry.library.weaponry.IWindup;
+import tconstruct.weaponry.library.weaponry.IWindup;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import org.lwjgl.opengl.GL11;
diff --git a/src/main/java/tconstruct/weaponry/client/renderer/ThrowingKnifeRenderer.java b/src/main/java/tconstruct/weaponry/client/renderer/ThrowingKnifeRenderer.java
index feb40f6d..f8583b1d 100644
--- a/src/main/java/tconstruct/weaponry/client/renderer/ThrowingKnifeRenderer.java
+++ b/src/main/java/tconstruct/weaponry/client/renderer/ThrowingKnifeRenderer.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.client.renderer;
+package tconstruct.weaponry.client.renderer;
 
-import boni.tinkersweaponry.library.weaponry.IWindup;
+import tconstruct.weaponry.library.weaponry.IWindup;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderPlayer;
diff --git a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java
index 477d042e..562e35fb 100644
--- a/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java
+++ b/src/main/java/tconstruct/weaponry/entity/ArrowEntity.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.entity;
+package tconstruct.weaponry.entity;
 
-import boni.tinkersweaponry.library.util.PiercingArrowDamage;
+import tconstruct.weaponry.library.util.PiercingArrowDamage;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/tconstruct/weaponry/entity/BoltEntity.java b/src/main/java/tconstruct/weaponry/entity/BoltEntity.java
index 1e4759ce..82dccd44 100644
--- a/src/main/java/tconstruct/weaponry/entity/BoltEntity.java
+++ b/src/main/java/tconstruct/weaponry/entity/BoltEntity.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.entity;
+package tconstruct.weaponry.entity;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java
index 3badab8c..3a3547e2 100644
--- a/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java
+++ b/src/main/java/tconstruct/weaponry/entity/JavelinEntity.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.entity;
+package tconstruct.weaponry.entity;
 
-import boni.tinkersweaponry.TinkerWeaponry;
+import tconstruct.weaponry.TinkerWeaponry;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/entity/ProjectileBase.java b/src/main/java/tconstruct/weaponry/entity/ProjectileBase.java
index 0adb84e8..51e2ae8a 100644
--- a/src/main/java/tconstruct/weaponry/entity/ProjectileBase.java
+++ b/src/main/java/tconstruct/weaponry/entity/ProjectileBase.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.entity;
+package tconstruct.weaponry.entity;
 
-import boni.tinkersweaponry.library.weaponry.AmmoItem;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.library.weaponry.AmmoItem;
+import tconstruct.weaponry.util.Reference;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import io.netty.buffer.ByteBuf;
diff --git a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java
index 46af84cb..02f3f5d9 100644
--- a/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java
+++ b/src/main/java/tconstruct/weaponry/entity/ShurikenEntity.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.entity;
+package tconstruct.weaponry.entity;
 
-import boni.tinkersweaponry.TinkerWeaponry;
+import tconstruct.weaponry.TinkerWeaponry;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java b/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java
index 70cd9523..3226f6b7 100644
--- a/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java
+++ b/src/main/java/tconstruct/weaponry/entity/ThrowingKnifeEntity.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.entity;
+package tconstruct.weaponry.entity;
 
-import boni.tinkersweaponry.TinkerWeaponry;
+import tconstruct.weaponry.TinkerWeaponry;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
diff --git a/src/main/java/tconstruct/weaponry/items/CustomToolPart.java b/src/main/java/tconstruct/weaponry/items/CustomToolPart.java
index 12d906eb..7a01cbb6 100644
--- a/src/main/java/tconstruct/weaponry/items/CustomToolPart.java
+++ b/src/main/java/tconstruct/weaponry/items/CustomToolPart.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.items;
+package tconstruct.weaponry.items;
 
 import net.minecraft.item.ItemStack;
 import tconstruct.TConstruct;
diff --git a/src/main/java/tconstruct/weaponry/items/DualMaterialToolPart.java b/src/main/java/tconstruct/weaponry/items/DualMaterialToolPart.java
index e6fea053..d80efa72 100644
--- a/src/main/java/tconstruct/weaponry/items/DualMaterialToolPart.java
+++ b/src/main/java/tconstruct/weaponry/items/DualMaterialToolPart.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.items;
+package tconstruct.weaponry.items;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.util.Reference;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java b/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java
index 465c87a0..c72e77e8 100644
--- a/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java
+++ b/src/main/java/tconstruct/weaponry/items/WeaponryPattern.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.items;
+package tconstruct.weaponry.items;
 
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.util.Reference;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/items/WeaponryToolPart.java b/src/main/java/tconstruct/weaponry/items/WeaponryToolPart.java
index b8ef74ea..c5c100ae 100644
--- a/src/main/java/tconstruct/weaponry/items/WeaponryToolPart.java
+++ b/src/main/java/tconstruct/weaponry/items/WeaponryToolPart.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.items;
+package tconstruct.weaponry.items;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.util.Reference;
 import tconstruct.library.tools.DynamicToolPart;
 
 public class WeaponryToolPart extends DynamicToolPart {
diff --git a/src/main/java/tconstruct/weaponry/library/util/PiercingArrowDamage.java b/src/main/java/tconstruct/weaponry/library/util/PiercingArrowDamage.java
index bf27a794..e68c919e 100644
--- a/src/main/java/tconstruct/weaponry/library/util/PiercingArrowDamage.java
+++ b/src/main/java/tconstruct/weaponry/library/util/PiercingArrowDamage.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.library.util;
+package tconstruct.weaponry.library.util;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.util.EntityDamageSourceIndirect;
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/AmmoItem.java b/src/main/java/tconstruct/weaponry/library/weaponry/AmmoItem.java
index 5ee30d58..555d4b35 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/AmmoItem.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/AmmoItem.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.util.Reference;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/AmmoWeapon.java b/src/main/java/tconstruct/weaponry/library/weaponry/AmmoWeapon.java
index 1eb4dc57..9bfadf08 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/AmmoWeapon.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/AmmoWeapon.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
-import boni.tinkersweaponry.client.CrosshairType;
+import tconstruct.weaponry.client.CrosshairType;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/ArrowShaftMaterial.java b/src/main/java/tconstruct/weaponry/library/weaponry/ArrowShaftMaterial.java
index fdd888b3..23745dd0 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/ArrowShaftMaterial.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/ArrowShaftMaterial.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
-import boni.tinkersweaponry.TinkerWeaponry;
+import tconstruct.weaponry.TinkerWeaponry;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import tconstruct.library.tools.CustomMaterial;
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/weaponry/library/weaponry/BowBaseAmmo.java
index 25aae575..af99fcfd 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/BowBaseAmmo.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/BowBaseAmmo.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
-import boni.tinkersweaponry.ammo.ArrowAmmo;
-import boni.tinkersweaponry.entity.ArrowEntity;
+import tconstruct.weaponry.ammo.ArrowAmmo;
+import tconstruct.weaponry.entity.ArrowEntity;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/IAccuracy.java b/src/main/java/tconstruct/weaponry/library/weaponry/IAccuracy.java
index 30ab05ba..ee93370b 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/IAccuracy.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/IAccuracy.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/IAmmo.java b/src/main/java/tconstruct/weaponry/library/weaponry/IAmmo.java
index ae06eba9..441b2bf9 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/IAmmo.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/IAmmo.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/IWindup.java b/src/main/java/tconstruct/weaponry/library/weaponry/IWindup.java
index 4b72714a..417a253e 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/IWindup.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/IWindup.java
@@ -1,6 +1,6 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
-import boni.tinkersweaponry.client.CrosshairType;
+import tconstruct.weaponry.client.CrosshairType;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/tconstruct/weaponry/library/weaponry/ProjectileWeapon.java b/src/main/java/tconstruct/weaponry/library/weaponry/ProjectileWeapon.java
index ec4fc2c0..478c2c8c 100644
--- a/src/main/java/tconstruct/weaponry/library/weaponry/ProjectileWeapon.java
+++ b/src/main/java/tconstruct/weaponry/library/weaponry/ProjectileWeapon.java
@@ -1,8 +1,8 @@
-package boni.tinkersweaponry.library.weaponry;
+package tconstruct.weaponry.library.weaponry;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.client.CrosshairType;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.client.CrosshairType;
+import tconstruct.weaponry.util.Reference;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/main/java/tconstruct/weaponry/util/Config.java b/src/main/java/tconstruct/weaponry/util/Config.java
index 053634fb..c01a3430 100644
--- a/src/main/java/tconstruct/weaponry/util/Config.java
+++ b/src/main/java/tconstruct/weaponry/util/Config.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.util;
+package tconstruct.weaponry.util;
 
 public class Config {
 }
diff --git a/src/main/java/tconstruct/weaponry/util/Reference.java b/src/main/java/tconstruct/weaponry/util/Reference.java
index f69f03cb..731ce9ec 100644
--- a/src/main/java/tconstruct/weaponry/util/Reference.java
+++ b/src/main/java/tconstruct/weaponry/util/Reference.java
@@ -1,4 +1,4 @@
-package boni.tinkersweaponry.util;
+package tconstruct.weaponry.util;
 
 public final class Reference {
     private Reference() {}
diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java
index 24bd92d1..398b1c3b 100644
--- a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java
+++ b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java
@@ -1,12 +1,12 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.ammo.BoltAmmo;
-import boni.tinkersweaponry.entity.BoltEntity;
-import boni.tinkersweaponry.library.weaponry.AmmoItem;
-import boni.tinkersweaponry.library.weaponry.ProjectileWeapon;
-import boni.tinkersweaponry.util.Reference;
-import boni.tinkersweaponry.library.weaponry.IAmmo;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.ammo.BoltAmmo;
+import tconstruct.weaponry.entity.BoltEntity;
+import tconstruct.weaponry.library.weaponry.AmmoItem;
+import tconstruct.weaponry.library.weaponry.ProjectileWeapon;
+import tconstruct.weaponry.util.Reference;
+import tconstruct.weaponry.library.weaponry.IAmmo;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
diff --git a/src/main/java/tconstruct/weaponry/weapons/Javelin.java b/src/main/java/tconstruct/weaponry/weapons/Javelin.java
index 49bc11ed..f30c028a 100644
--- a/src/main/java/tconstruct/weaponry/weapons/Javelin.java
+++ b/src/main/java/tconstruct/weaponry/weapons/Javelin.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.entity.JavelinEntity;
-import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
+import tconstruct.weaponry.entity.JavelinEntity;
+import tconstruct.weaponry.library.weaponry.AmmoWeapon;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/main/java/tconstruct/weaponry/weapons/LongBow.java b/src/main/java/tconstruct/weaponry/weapons/LongBow.java
index d3302d90..9ffbd7a8 100644
--- a/src/main/java/tconstruct/weaponry/weapons/LongBow.java
+++ b/src/main/java/tconstruct/weaponry/weapons/LongBow.java
@@ -1,8 +1,8 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.ammo.ArrowAmmo;
-import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.ammo.ArrowAmmo;
+import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java
index 82e33676..a96182a9 100644
--- a/src/main/java/tconstruct/weaponry/weapons/ShortBow.java
+++ b/src/main/java/tconstruct/weaponry/weapons/ShortBow.java
@@ -1,8 +1,8 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.ammo.ArrowAmmo;
-import boni.tinkersweaponry.library.weaponry.BowBaseAmmo;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.ammo.ArrowAmmo;
+import tconstruct.weaponry.library.weaponry.BowBaseAmmo;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java
index 6384c0e2..46810518 100644
--- a/src/main/java/tconstruct/weaponry/weapons/Shuriken.java
+++ b/src/main/java/tconstruct/weaponry/weapons/Shuriken.java
@@ -1,10 +1,10 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.TinkerWeaponry;
-import boni.tinkersweaponry.client.CrosshairType;
-import boni.tinkersweaponry.client.IconFlipped;
-import boni.tinkersweaponry.entity.ShurikenEntity;
-import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
+import tconstruct.weaponry.TinkerWeaponry;
+import tconstruct.weaponry.client.CrosshairType;
+import tconstruct.weaponry.client.IconFlipped;
+import tconstruct.weaponry.entity.ShurikenEntity;
+import tconstruct.weaponry.library.weaponry.AmmoWeapon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/main/java/tconstruct/weaponry/weapons/ThrowArrow.java b/src/main/java/tconstruct/weaponry/weapons/ThrowArrow.java
index 980142c9..3e225d08 100644
--- a/src/main/java/tconstruct/weaponry/weapons/ThrowArrow.java
+++ b/src/main/java/tconstruct/weaponry/weapons/ThrowArrow.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.entity.ArrowEntity;
-import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
+import tconstruct.weaponry.entity.ArrowEntity;
+import tconstruct.weaponry.library.weaponry.AmmoWeapon;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
diff --git a/src/main/java/tconstruct/weaponry/weapons/ThrowArrowItem.java b/src/main/java/tconstruct/weaponry/weapons/ThrowArrowItem.java
index 7793a059..1384f15d 100644
--- a/src/main/java/tconstruct/weaponry/weapons/ThrowArrowItem.java
+++ b/src/main/java/tconstruct/weaponry/weapons/ThrowArrowItem.java
@@ -1,7 +1,7 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.entity.ArrowEntity;
-import boni.tinkersweaponry.util.Reference;
+import tconstruct.weaponry.entity.ArrowEntity;
+import tconstruct.weaponry.util.Reference;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
diff --git a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java
index c21b9571..7bfde93a 100644
--- a/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java
+++ b/src/main/java/tconstruct/weaponry/weapons/ThrowingKnife.java
@@ -1,8 +1,8 @@
-package boni.tinkersweaponry.weapons;
+package tconstruct.weaponry.weapons;
 
-import boni.tinkersweaponry.client.CrosshairType;
-import boni.tinkersweaponry.entity.ThrowingKnifeEntity;
-import boni.tinkersweaponry.library.weaponry.AmmoWeapon;
+import tconstruct.weaponry.client.CrosshairType;
+import tconstruct.weaponry.entity.ThrowingKnifeEntity;
+import tconstruct.weaponry.library.weaponry.AmmoWeapon;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.Entity;