diff --git a/1.5/Defs/DamageDefs/Energy_Weapon_DamageDefs.xml b/1.5/Defs/DamageDefs/Energy_Weapon_DamageDefs.xml
new file mode 100644
index 0000000..6ac5109
--- /dev/null
+++ b/1.5/Defs/DamageDefs/Energy_Weapon_DamageDefs.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+    <!--__________ Energy Weapon Damage __________-->
+
+    <!--_____ Plasma Weapon Damage _____-->
+
+    <!-- Plasma Burn -->
+
+    <DamageDef Name="BurnPlasma">
+        <defName>FCP_Damage_Plasma_Burn</defName>
+        <workerClass>FalloutCore.PlasmaBurn</workerClass>
+        <label>plasma burn</label>
+        <hasForcefulImpact>false</hasForcefulImpact>
+        <makesBlood>false</makesBlood>
+        <canInterruptJobs>false</canInterruptJobs>
+        <externalViolence>true</externalViolence>
+        <deathMessage>{0} has been burned to death by plasma.</deathMessage>
+        <hediff>FCP_Hediff_Plasma_Burn</hediff>
+        <armorCategory>Heat</armorCategory>
+        <buildingDamageFactor>2</buildingDamageFactor>
+        <minDamageToFragment>15</minDamageToFragment>
+        <defaultArmorPenetration>0.6</defaultArmorPenetration>
+        <explosionHeatEnergyPerCell>15</explosionHeatEnergyPerCell>
+        <explosionCellFleck>BlastFlame</explosionCellFleck>
+        <explosionColorCenter>(1, 0.7, 0.7)</explosionColorCenter>
+        <explosionColorEdge>(1, 1, 0.7)</explosionColorEdge>
+        <soundExplosion>Explosion_Flame</soundExplosion>
+        <combatLogRules>Damage_Flame</combatLogRules>
+        <canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+    </DamageDef>
+
+    <!--_____ Laser Weapon Damage _____-->
+
+    <!-- Laser Burn -->
+
+    <DamageDef Name="BurnLaser">
+        <defName>FCP_Damage_Laser_Burn</defName>
+        <workerClass>FalloutCore.LaserBurn</workerClass>
+        <label>laser burn</label>
+        <hasForcefulImpact>false</hasForcefulImpact>
+        <makesBlood>false</makesBlood>
+        <canInterruptJobs>false</canInterruptJobs>
+        <externalViolence>true</externalViolence>
+        <deathMessage>{0} has been laser burned to death.</deathMessage>
+        <hediff>FCP_Hediff_Laser_Burn</hediff>
+        <armorCategory>Heat</armorCategory>
+        <minDamageToFragment>15</minDamageToFragment>
+        <defaultDamage>10</defaultDamage>
+        <defaultArmorPenetration>0</defaultArmorPenetration>
+        <explosionHeatEnergyPerCell>15</explosionHeatEnergyPerCell>
+        <explosionCellFleck>BlastFlame</explosionCellFleck>
+        <explosionColorCenter>(1, 0.7, 0.7)</explosionColorCenter>
+        <explosionColorEdge>(1, 1, 0.7)</explosionColorEdge>
+        <soundExplosion>Explosion_Flame</soundExplosion>
+        <combatLogRules>Damage_Flame</combatLogRules>
+        <canUseDeflectMetalEffect>false</canUseDeflectMetalEffect>
+    </DamageDef>
+
+    <!--_____ Gauss Weapon Damage _____-->
+
+
+
+    <!--_____ Pulse Weapon Damage _____-->
+
+
+</Defs>
\ No newline at end of file
diff --git a/1.5/Defs/HediffDefs/Energy_Weapon_HediffDefs.xml b/1.5/Defs/HediffDefs/Energy_Weapon_HediffDefs.xml
new file mode 100644
index 0000000..0508916
--- /dev/null
+++ b/1.5/Defs/HediffDefs/Energy_Weapon_HediffDefs.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+    <!--__________ Energy Weapon Hediffs __________-->
+
+    <!--_____ Plasma Weapon Hediffs _____-->
+
+    <!-- Plasma Burn -->
+
+    <HediffDef ParentName="InjuryBase">
+        <defName>FCP_Hediff_Plasma_Burn</defName>
+        <label>Plasma Burn</label>
+        <labelNoun>a plasma burn</labelNoun>
+        <description>A plasma burn with minimal pain.</description>
+        <comps>
+            <li Class="HediffCompProperties_TendDuration">
+                <labelTendedWell>bandaged</labelTendedWell>
+                <labelTendedWellInner>tended</labelTendedWellInner>
+                <labelSolidTendedWell>tended</labelSolidTendedWell>
+            </li>
+            <li Class="HediffCompProperties_Infecter">
+                <infectionChance>0.30</infectionChance>
+            </li>
+            <li Class="HediffCompProperties_GetsPermanent">
+                <permanentLabel>plasma burn scar</permanentLabel>
+            </li>
+        </comps>
+        <injuryProps>
+            <painPerSeverity>0.0042</painPerSeverity>
+            <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+            <canMerge>true</canMerge>
+            <destroyedLabel>Burned off</destroyedLabel>
+            <destroyedOutLabel>Burned out</destroyedOutLabel>
+        </injuryProps>
+    </HediffDef>
+
+    <!--_____ Laser Weapon Hediffs _____-->
+
+    <!-- Laser Burn -->
+
+    <HediffDef ParentName="InjuryBase">
+        <defName>FCP_Hediff_Laser_Burn</defName>
+        <label>Laser Burn</label>
+        <labelNoun>a laser burn</labelNoun>
+        <description>A laser burn with minimal pain.</description>
+        <comps>
+            <li Class="HediffCompProperties_TendDuration">
+                <labelTendedWell>bandaged</labelTendedWell>
+                <labelTendedWellInner>tended</labelTendedWellInner>
+                <labelSolidTendedWell>tended</labelSolidTendedWell>
+            </li>
+            <li Class="HediffCompProperties_Infecter">
+                <infectionChance>0.30</infectionChance>
+            </li>
+            <li Class="HediffCompProperties_GetsPermanent">
+                <permanentLabel>laser burn scar</permanentLabel>
+            </li>
+        </comps>
+        <injuryProps>
+            <painPerSeverity>0.0042</painPerSeverity>
+            <averagePainPerSeverityPermanent>0.00625</averagePainPerSeverityPermanent>
+            <canMerge>true</canMerge>
+            <destroyedLabel>Burned off</destroyedLabel>
+            <destroyedOutLabel>Burned out</destroyedOutLabel>
+        </injuryProps>
+    </HediffDef>
+
+    <!--_____ Gauss Weapon Hediffs _____-->
+
+
+
+    <!--_____ Pulse Weapon Hediffs _____-->
+
+
+
+</Defs>
\ No newline at end of file
diff --git a/1.5/Defs/ThingDefs_Filth/ThingDefs_Filth.xml b/1.5/Defs/ThingDefs_Filth/ThingDefs_Filth.xml
new file mode 100644
index 0000000..2ab2c6e
--- /dev/null
+++ b/1.5/Defs/ThingDefs_Filth/ThingDefs_Filth.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Defs>
+
+    <!--__________ Energy Weapon Filths __________-->
+
+    <!--_____ Laser Weapon Filth _____-->
+
+    <!-- Ash Pile -->
+
+	<ThingDef ParentName="BaseFilth">
+		<defName>FG_Filth_AshPile</defName>
+		<label>Ash Pile</label>
+		<altitudeLayer>Projectile</altitudeLayer>
+		<statBases>
+			<Beauty>-12</Beauty>
+			<Cleanliness>-15</Cleanliness>
+		</statBases>
+		<graphicData>
+			<graphicClass>Graphic_Random</graphicClass>
+			<texPath>Things/Filth/Ash_Pile</texPath>
+			<drawSize>1.5</drawSize>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+		<filth>
+			<cleaningWorkToReduceThickness>70</cleaningWorkToReduceThickness>
+			<canFilthAttach>true</canFilthAttach>
+		</filth>
+	</ThingDef>
+
+    <!--_____ Plasma Weapon Filth _____-->
+
+    <!-- Goo Pile -->
+
+	<ThingDef ParentName="BaseFilth">
+		<defName>FG_Filth_Goop</defName>
+		<label>goop</label>
+		<altitudeLayer>Projectile</altitudeLayer>
+		<statBases>
+			<Beauty>-12</Beauty>
+			<Cleanliness>-15</Cleanliness>
+		</statBases>
+		<graphicData>
+			<graphicClass>Graphic_Random</graphicClass>
+			<texPath>Things/Filth/Goop_Pile</texPath>
+			<drawSize>1</drawSize>
+			<onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+		</graphicData>
+		<filth>
+			<cleaningWorkToReduceThickness>70</cleaningWorkToReduceThickness>
+			<canFilthAttach>true</canFilthAttach>
+		</filth>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/1.5/Defs/ThingDefs_Weapons/ThingDefs_Energy_Bullets.xml b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Energy_Bullets.xml
new file mode 100644
index 0000000..302bbf7
--- /dev/null
+++ b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Energy_Bullets.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!--__________ Laser Bullets __________-->
+
+    <!-- Laser -->
+
+    <ThingDef ParentName="BaseBullet">
+        <defName>FCP_Bullet_Laser</defName>
+        <label>Laser Shot</label>
+        <graphicData>
+            <texPath>Things/Projectile/FCP_Laser</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+        </graphicData>
+        <projectile>
+            <damageDef>FCP_Damage_Laser_Burn</damageDef>
+            <damageAmountBase>18</damageAmountBase>
+            <armorPenetrationBase>0.4</armorPenetrationBase>
+            <speed>70</speed>
+        </projectile>
+    </ThingDef>
+
+    <!-- MF Breeder -->
+
+    <ThingDef ParentName="BaseBullet">
+        <defName>FCP_Bullet_MF_Breeder</defName>
+        <label>Laser Shot</label>
+        <graphicData>
+            <texPath>Things/Projectile/FCP_Laser</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+        </graphicData>
+        <projectile>
+            <damageDef>FCP_Damage_Laser_Burn</damageDef>
+            <damageAmountBase>12</damageAmountBase>
+            <armorPenetrationBase>0.4</armorPenetrationBase>
+            <speed>65</speed>
+        </projectile>
+    </ThingDef>
+
+    <!-- Laser S -->
+
+    <ThingDef ParentName="BaseBullet">
+        <defName>FCP_Bullet_Laser_S</defName>
+        <label>Laser Shot</label>
+        <graphicData>
+            <texPath>Things/Projectile/FCP_Laser_S</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+        </graphicData>
+        <projectile>
+            <damageDef>FCP_Damage_Laser_Burn</damageDef>
+            <damageAmountBase>20</damageAmountBase>
+            <armorPenetrationBase>0.8</armorPenetrationBase>
+            <speed>75</speed>
+        </projectile>
+    </ThingDef>
+
+    <!--__________ Plasma Bullets __________-->
+
+    <!-- Plasma Cast -->
+
+    <ThingDef ParentName="BaseBullet">
+        <defName>FCP_Bullet_Plasma</defName>
+        <label>Plasma Cast</label>
+        <graphicData>
+            <texPath>Things/Projectile/FCP_Plasma</texPath>
+            <graphicClass>Graphic_Single</graphicClass>
+        </graphicData>
+        <projectile>
+            <damageDef>FCP_Damage_Plasma_Burn</damageDef>
+            <damageAmountBase>18</damageAmountBase>
+            <armorPenetrationBase>1.5</armorPenetrationBase>
+            <speed>55</speed>
+        </projectile>
+    </ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/1.5/Defs/ThingDefs_Weapons/ThingDefs_Laser_Weapons.xml b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Laser_Weapons.xml
index c1f3e07..7dec4ca 100644
--- a/1.5/Defs/ThingDefs_Weapons/ThingDefs_Laser_Weapons.xml
+++ b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Laser_Weapons.xml
@@ -11,7 +11,7 @@
         <description>The AEP7 laser pistol comes with a generous battery size, tight shot grouping at range, resilience to extended use, and fairly decent damage output, it is a very good choice for a sidearm and is used extensively in this role by the Brotherhood of Steel and the Enclave. Like other energy weapons, the laser pistol has the ability to reduce enemies to piles of steaming ash.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Laser_Pistol</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Laser_Pistol</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -25,7 +25,7 @@
             <RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>6</Crafting>
             </skillRequirements>
@@ -51,7 +51,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>17.0</range>
                 <soundCast>Shot_Laser</soundCast>
@@ -93,7 +93,7 @@
         <description>This unique laser pistol once belonged to a man who murdered people for their sunset sarsaparilla star bottle caps. It’s coloured red, looks scratched and worn and its focus adjustment knob was replaced with a bottle cap. Despite its ramshackle appearance, it’s projectiles hit extremely hard, but it fires much slower than the standard laser pistol.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Pew_Pew</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Pew_Pew</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -107,7 +107,7 @@
             <RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>7</Crafting>
             </skillRequirements>
@@ -133,7 +133,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>15.0</range>
                 <soundCast>Shot_Laser</soundCast>
@@ -175,7 +175,7 @@
         <description>A staple of the pre-war armed forces, the laser rifle has become a somewhat unusual sight in the wasteland, especially one in good condition. They emit a concentrated beam of coherent light capable of severely damaging what- or whoever it was aimed at.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Laser_Rifle</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Laser_Rifle</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -189,7 +189,7 @@
             <RangedWeapon_Cooldown>0.88</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -215,7 +215,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>25.9</range>
                 <soundCast>Shot_Laser</soundCast>
@@ -257,7 +257,7 @@
         <description>A unique, light grey prototype laser rifle with orange trims. It also has two circuit chips taped to its stock, which are connected to the rest of the weapon via wires. Its beams do a lot more damage and are of green color.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_AER14_Prototype</texPath>
+            <texPath>Things/Weapons/Laser/FCP_AER14_Prototype</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -271,7 +271,7 @@
             <RangedWeapon_Cooldown>1.25</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>10</Crafting>
             </skillRequirements>
@@ -297,7 +297,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser</defaultProjectile>
                 <warmupTime>1.5</warmupTime>
                 <range>30</range>
                 <soundCast>Shot_Laser</soundCast>
@@ -339,7 +339,7 @@
         <description>The tri-beam laser rifle appears to be a shortened laser rifle with a different emitter at its tip. It fires three beams of laser at once, serving as a high-tech alternative to shotguns. Like less advanced shotguns, the tri-beam laser rifle is best suited for combat over short ranges.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Tri_Beam_Laser_Rifle</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Tri_Beam_Laser_Rifle</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -353,7 +353,7 @@
             <RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -379,7 +379,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>17.9</range>
                 <ticksBetweenBurstShots>9</ticksBetweenBurstShots>
@@ -423,7 +423,7 @@
         <description>A huge and heavy laser weapon reminiscent of Minigun and popular with the Brotherhood of Steel. Its individual shots do little damage, but this is entirely compensated by its extremely high rate of fire. It excels at the same areas as the Minigun, providing suppressing fire over short and medium distances.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Gatling_Laser</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Gatling_Laser_mkII</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -437,7 +437,7 @@
             <RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>9</Crafting>
             </skillRequirements>
@@ -463,7 +463,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser</defaultProjectile>
                 <warmupTime>1.50</warmupTime>
                 <range>30.9</range>
                 <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
@@ -507,7 +507,7 @@
         <description>The Sprtel-Wood 9700 is a high-speed Gatling laser that shoots green lasers. It has an ammunition capacity of 90 electron charge packs and moderate weapon spread. The Sprtel-Wood 9700 can inflict 16 damage per hit in good condition, but it has a slightly below-average critical hit chance for an automatic weapon.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Sprtel_Wood_9700a</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Sprtel_Wood_9700a</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -521,7 +521,7 @@
             <RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>9</Crafting>
             </skillRequirements>
@@ -547,7 +547,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser_S</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser_S</defaultProjectile>
                 <warmupTime>1.50</warmupTime>
                 <range>30.9</range>
                 <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
@@ -591,7 +591,7 @@
         <description>The laser rapid capacitor weapon is a strange gun that mimics a submachinegun. The unique feature of the RCW is the addition of a drum magazine, which gives this weapon its unique look, high rate of fire, and name. This weapon exhibits moderate accuracy due to a high spread for a laser weapon, making it useful for taking down enemies at almost any range.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Laser_RCW</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Laser_RCW</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -605,7 +605,7 @@
             <RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>7</Crafting>
             </skillRequirements>
@@ -631,7 +631,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Laser</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Laser</defaultProjectile>
                 <warmupTime>1.9</warmupTime>
                 <range>20.9</range>
                 <ticksBetweenBurstShots>9</ticksBetweenBurstShots>
@@ -675,7 +675,7 @@
         <description>The recharger pistol is a compact version of the recharger rifle, featuring a microfusion breeder that replenishes its ammunition automatically, no reloading required. While it can fire rapidly, the projectiles do less damage compared to a laser pistol. The breeder generates ammunition at a slow rate, meaning it can shoot bursts of projectiles fast, but there is considerable time in between those bursts. It is generally cheaper and more portable than the recharger rifle.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Recharger_Rifle</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Recharger_Rifle</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -689,7 +689,7 @@
             <RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -715,7 +715,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_MF_Breeder</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_MF_Breeder</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>25.9</range>
                 <ticksBetweenBurstShots>18</ticksBetweenBurstShots>
@@ -754,7 +754,7 @@
         <description>The recharger rifle was the first energy weapon featuring a microfusion breeder. It replenishes its ammunition automatically, no reloading required. However, the underlying technology wasn’t very sophisticated yet. It can fire rapidly, but the projectiles do significantly less damage compared to a laser rifle. The inefficient breeder generates ammunition at a slow rate, meaning it can shoot bursts of projectiles fast, but there is a considerably time in between those bursts. At least it usually is a lot cheaper than a laser rifle.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_Recharger_Pistol</texPath>
+            <texPath>Things/Weapons/Laser/FCP_Recharger_Pistol</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -768,7 +768,7 @@
             <RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -794,7 +794,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_MF_Breeder</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_MF_Breeder</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>16.9</range>
                 <ticksBetweenBurstShots>14</ticksBetweenBurstShots>
@@ -833,7 +833,7 @@
         <description>This recharger pistol is the second version of a self-charging weapon, with effectively limitless ammunition. It is a more advanced and compact version of the recharger rifle, which is fitted with a microfusion breeder that provides virtually limitless power, as well as a 10-shot charge capacity. It takes 0.3 seconds to recharge one shot, and three seconds are required to recover from a fully discharged state. It will not recharge unless equipped and is not automatically charged when drawn. This causes a delay before the first shot can be fired.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Laser/FCP_MF_hyperbreeder_Alpha</texPath>
+            <texPath>Things/Weapons/Laser/FCP_MF_hyperbreeder_Alpha</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -847,7 +847,7 @@
             <RangedWeapon_Cooldown>0.8</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Laser_Weapon_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -873,7 +873,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_MF_Breeder</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_MF_Breeder</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>20.9</range>
                 <ticksBetweenBurstShots>14</ticksBetweenBurstShots>
diff --git a/1.5/Defs/ThingDefs_Weapons/ThingDefs_Plasma_Weapons.xml b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Plasma_Weapons.xml
index 49598d6..2035e26 100644
--- a/1.5/Defs/ThingDefs_Weapons/ThingDefs_Plasma_Weapons.xml
+++ b/1.5/Defs/ThingDefs_Weapons/ThingDefs_Plasma_Weapons.xml
@@ -15,7 +15,7 @@
             inflicting massive damage.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Plasma/FCP_Plasma_Pistol</texPath>
+            <texPath>Things/Weapons/Plasma/FCP_Plasma_Pistol</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -29,7 +29,7 @@
             <RangedWeapon_Cooldown>1.4</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Plasma_Weapons_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>7</Crafting>
             </skillRequirements>
@@ -55,7 +55,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Plasma</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Plasma</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>18.9</range>
                 <soundCast>Shot_Plasma</soundCast>
@@ -100,7 +100,7 @@
             However, it’s an exceptionally rare and expensive weapon usually reserved as a sidearm for high-ranking officers in high-tech groups such as the Enclave.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Plasma/FCP_Plasma_Defender</texPath>
+            <texPath>Things/Weapons/Plasma/FCP_Plasma_Defender</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -114,7 +114,7 @@
             <RangedWeapon_Cooldown>1.6</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Plasma_Weapons_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>7</Crafting>
             </skillRequirements>
@@ -140,7 +140,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Plasma</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Plasma</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>17.9</range>
                 <soundCast>Shot_Plasma</soundCast>
@@ -186,7 +186,7 @@
             suited for experienced soldiers.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Plasma/FCP_Plasma_Rifle</texPath>
+            <texPath>Things/Weapons/Plasma/FCP_Plasma_Rifle</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -200,7 +200,7 @@
             <RangedWeapon_Cooldown>1.75</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Plasma_Weapons_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -226,7 +226,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Plasma</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Plasma</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>20.9</range>
                 <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
@@ -283,7 +283,7 @@
             average, but a more consistent delay between shots, an increase in active bolt charge
             time, increased accuracy and a 30% increase in bolt energy.</description>
         <graphicData>
-            <texPath>Plasma/FCP_Q35_Matter_Modulator</texPath>
+            <texPath>Things/Weapons/Plasma/FCP_Q35_Matter_Modulator</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -297,7 +297,7 @@
             <RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Plasma_Weapons_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>10</Crafting>
             </skillRequirements>
@@ -323,7 +323,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Plasma</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Plasma</defaultProjectile>
                 <warmupTime>1.5</warmupTime>
                 <range>25.9</range>
                 <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
@@ -370,7 +370,7 @@
             short ranges.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Plasma/FCP_Multiplas_Rifle</texPath>
+            <texPath>Things/Weapons/Plasma/FCP_Multiplas_Rifle</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <soundInteract>Interact_ChargeRifle</soundInteract>
@@ -384,7 +384,7 @@
             <RangedWeapon_Cooldown>1.8</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Plasma_Weapons_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>8</Crafting>
             </skillRequirements>
@@ -410,7 +410,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Plasma</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Plasma</defaultProjectile>
                 <warmupTime>1.0</warmupTime>
                 <range>15.9</range>
                 <ticksBetweenBurstShots>12</ticksBetweenBurstShots>
@@ -457,7 +457,7 @@
             rifle, it fires both faster and harder-hitting, but is significantly less accurate.</description>
         <techLevel>Spacer</techLevel>
         <graphicData>
-            <texPath>Plasma/FCP_Plasma_Caster</texPath>
+            <texPath>Things/Weapons/Plasma/FCP_Plasma_Caster_mkII</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
         <equippedAngleOffset>45</equippedAngleOffset>
@@ -472,7 +472,7 @@
             <RangedWeapon_Cooldown>1.9</RangedWeapon_Cooldown>
         </statBases>
         <recipeMaker>
-            <researchPrerequisite>ChargedShot</researchPrerequisite>
+            <researchPrerequisite>FCP_Tools_Plasma_Weapons_Manufacturing</researchPrerequisite>
             <skillRequirements>
                 <Crafting>9</Crafting>
             </skillRequirements>
@@ -498,7 +498,7 @@
             <li>
                 <verbClass>Verb_Shoot</verbClass>
                 <hasStandardCommand>true</hasStandardCommand>
-                <defaultProjectile>Bullet_Plasma</defaultProjectile>
+                <defaultProjectile>FCP_Bullet_Plasma</defaultProjectile>
                 <warmupTime>1.50</warmupTime>
                 <range>35.9</range>
                 <ticksBetweenBurstShots>10</ticksBetweenBurstShots>
@@ -534,21 +534,4 @@
         </modExtensions>
     </ThingDef>
 
-    <!-- Bullet -->
-
-    <ThingDef ParentName="BaseBullet">
-        <defName>Bullet_Plasma</defName>
-        <label>Plasma Cast</label>
-        <graphicData>
-            <texPath>Things/Projectile/FCP_Plasma</texPath>
-            <graphicClass>Graphic_Single</graphicClass>
-        </graphicData>
-        <projectile>
-            <damageDef>Plasmaburn</damageDef>
-            <damageAmountBase>18</damageAmountBase>
-            <armorPenetrationBase>1.5</armorPenetrationBase>
-            <speed>55</speed>
-        </projectile>
-    </ThingDef>
-
 </Defs>
\ No newline at end of file
diff --git a/About/ModIcon.png b/About/ModIcon.png
new file mode 100644
index 0000000..b5923da
Binary files /dev/null and b/About/ModIcon.png differ
diff --git a/About/Preview.png b/About/Preview.png
new file mode 100644
index 0000000..ae1110e
Binary files /dev/null and b/About/Preview.png differ
diff --git a/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileA.png b/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileA.png
new file mode 100644
index 0000000..21f1b40
Binary files /dev/null and b/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileA.png differ
diff --git a/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileB.png b/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileB.png
new file mode 100644
index 0000000..8bd8319
Binary files /dev/null and b/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileB.png differ
diff --git a/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileC.png b/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileC.png
new file mode 100644
index 0000000..b7b7db0
Binary files /dev/null and b/Common/Textures/Things/Filth/Ash_Pile/FCP_Ash_PileC.png differ
diff --git a/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileA.png b/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileA.png
new file mode 100644
index 0000000..1bf5f58
Binary files /dev/null and b/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileA.png differ
diff --git a/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileB.png b/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileB.png
new file mode 100644
index 0000000..2fe1063
Binary files /dev/null and b/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileB.png differ
diff --git a/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileC.png b/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileC.png
new file mode 100644
index 0000000..95e783a
Binary files /dev/null and b/Common/Textures/Things/Filth/Goop_Pile/FCP_Goop_PileC.png differ
diff --git a/Common/Textures/Things/Projectile/FCP_Laser.png b/Common/Textures/Things/Projectile/FCP_Laser.png
new file mode 100644
index 0000000..0805934
Binary files /dev/null and b/Common/Textures/Things/Projectile/FCP_Laser.png differ
diff --git a/Common/Textures/Things/Projectile/FCP_Laser_S.png b/Common/Textures/Things/Projectile/FCP_Laser_S.png
new file mode 100644
index 0000000..c343d58
Binary files /dev/null and b/Common/Textures/Things/Projectile/FCP_Laser_S.png differ
diff --git a/Common/Textures/Things/Projectile/FCP_Plasma.png b/Common/Textures/Things/Projectile/FCP_Plasma.png
new file mode 100644
index 0000000..587d4ff
Binary files /dev/null and b/Common/Textures/Things/Projectile/FCP_Plasma.png differ
diff --git a/Common/Textures/Things/Projectile/FCP_Plasma_Heavy.png b/Common/Textures/Things/Projectile/FCP_Plasma_Heavy.png
new file mode 100644
index 0000000..d151541
Binary files /dev/null and b/Common/Textures/Things/Projectile/FCP_Plasma_Heavy.png differ
diff --git a/Common/Textures/Things/Projectile/FCP_Projectile_Pulse.png b/Common/Textures/Things/Projectile/FCP_Projectile_Pulse.png
new file mode 100644
index 0000000..70d8dba
Binary files /dev/null and b/Common/Textures/Things/Projectile/FCP_Projectile_Pulse.png differ
diff --git a/Common/Textures/Things/Weapons/Gauss/FCP_Gauss_Sniper_Rifle.png b/Common/Textures/Things/Weapons/Gauss/FCP_Gauss_Sniper_Rifle.png
new file mode 100644
index 0000000..c00e9ca
Binary files /dev/null and b/Common/Textures/Things/Weapons/Gauss/FCP_Gauss_Sniper_Rifle.png differ
diff --git a/Common/Textures/Things/Weapons/Gauss/FCP_M72_A2_Gauss_Rifle.png b/Common/Textures/Things/Weapons/Gauss/FCP_M72_A2_Gauss_Rifle.png
new file mode 100644
index 0000000..cbbb2e4
Binary files /dev/null and b/Common/Textures/Things/Weapons/Gauss/FCP_M72_A2_Gauss_Rifle.png differ
diff --git a/Common/Textures/Weapons/Laser/FCP_AER14_Prototype.png b/Common/Textures/Things/Weapons/Laser/FCP_AER14_Prototype.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_AER14_Prototype.png
rename to Common/Textures/Things/Weapons/Laser/FCP_AER14_Prototype.png
diff --git a/Common/Textures/Things/Weapons/Laser/FCP_DKS_501_Laser_Rifle.png b/Common/Textures/Things/Weapons/Laser/FCP_DKS_501_Laser_Rifle.png
new file mode 100644
index 0000000..f10eb22
Binary files /dev/null and b/Common/Textures/Things/Weapons/Laser/FCP_DKS_501_Laser_Rifle.png differ
diff --git a/Common/Textures/Things/Weapons/Laser/FCP_Gatling_Laser_mkI.png b/Common/Textures/Things/Weapons/Laser/FCP_Gatling_Laser_mkI.png
new file mode 100644
index 0000000..58d48fb
Binary files /dev/null and b/Common/Textures/Things/Weapons/Laser/FCP_Gatling_Laser_mkI.png differ
diff --git a/Common/Textures/Weapons/Laser/FCP_Gatling_Laser.png b/Common/Textures/Things/Weapons/Laser/FCP_Gatling_Laser_mkII.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Gatling_Laser.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Gatling_Laser_mkII.png
diff --git a/Common/Textures/Things/Weapons/Laser/FCP_Laser_Carbine.png b/Common/Textures/Things/Weapons/Laser/FCP_Laser_Carbine.png
new file mode 100644
index 0000000..d0af03b
Binary files /dev/null and b/Common/Textures/Things/Weapons/Laser/FCP_Laser_Carbine.png differ
diff --git a/Common/Textures/Weapons/Laser/FCP_Laser_Pistol.png b/Common/Textures/Things/Weapons/Laser/FCP_Laser_Pistol.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Laser_Pistol.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Laser_Pistol.png
diff --git a/Common/Textures/Weapons/Laser/FCP_Laser_RCW.png b/Common/Textures/Things/Weapons/Laser/FCP_Laser_RCW.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Laser_RCW.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Laser_RCW.png
diff --git a/Common/Textures/Weapons/Laser/FCP_Laser_Rifle.png b/Common/Textures/Things/Weapons/Laser/FCP_Laser_Rifle.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Laser_Rifle.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Laser_Rifle.png
diff --git a/Common/Textures/Weapons/Laser/FCP_MF_hyperbreeder_Alpha.png b/Common/Textures/Things/Weapons/Laser/FCP_MF_hyperbreeder_Alpha.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_MF_hyperbreeder_Alpha.png
rename to Common/Textures/Things/Weapons/Laser/FCP_MF_hyperbreeder_Alpha.png
diff --git a/Common/Textures/Weapons/Laser/FCP_Pew_Pew.png b/Common/Textures/Things/Weapons/Laser/FCP_Pew_Pew.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Pew_Pew.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Pew_Pew.png
diff --git a/Common/Textures/Weapons/Laser/FCP_Recharger_Pistol.png b/Common/Textures/Things/Weapons/Laser/FCP_Recharger_Pistol.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Recharger_Pistol.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Recharger_Pistol.png
diff --git a/Common/Textures/Weapons/Laser/FCP_Recharger_Rifle.png b/Common/Textures/Things/Weapons/Laser/FCP_Recharger_Rifle.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Recharger_Rifle.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Recharger_Rifle.png
diff --git a/Common/Textures/Weapons/Laser/FCP_Sprtel_Wood_9700a.png b/Common/Textures/Things/Weapons/Laser/FCP_Sprtel_Wood_9700a.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Sprtel_Wood_9700a.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Sprtel_Wood_9700a.png
diff --git a/Common/Textures/Weapons/Laser/FCP_Tri_Beam_Laser_Rifle.png b/Common/Textures/Things/Weapons/Laser/FCP_Tri_Beam_Laser_Rifle.png
similarity index 100%
rename from Common/Textures/Weapons/Laser/FCP_Tri_Beam_Laser_Rifle.png
rename to Common/Textures/Things/Weapons/Laser/FCP_Tri_Beam_Laser_Rifle.png
diff --git a/Common/Textures/Things/Weapons/Laser/FCP_Wattz_1000_Laser_Pistol.png b/Common/Textures/Things/Weapons/Laser/FCP_Wattz_1000_Laser_Pistol.png
new file mode 100644
index 0000000..abb523a
Binary files /dev/null and b/Common/Textures/Things/Weapons/Laser/FCP_Wattz_1000_Laser_Pistol.png differ
diff --git a/Common/Textures/Things/Weapons/Laser/FCP_Wattz_2000_Laser_Rifle.png b/Common/Textures/Things/Weapons/Laser/FCP_Wattz_2000_Laser_Rifle.png
new file mode 100644
index 0000000..909716b
Binary files /dev/null and b/Common/Textures/Things/Weapons/Laser/FCP_Wattz_2000_Laser_Rifle.png differ
diff --git a/Common/Textures/Things/Weapons/Plasma/FCP_Glock_86.png b/Common/Textures/Things/Weapons/Plasma/FCP_Glock_86.png
new file mode 100644
index 0000000..4e4cae1
Binary files /dev/null and b/Common/Textures/Things/Weapons/Plasma/FCP_Glock_86.png differ
diff --git a/Common/Textures/Things/Weapons/Plasma/FCP_M_94.png b/Common/Textures/Things/Weapons/Plasma/FCP_M_94.png
new file mode 100644
index 0000000..6f94c80
Binary files /dev/null and b/Common/Textures/Things/Weapons/Plasma/FCP_M_94.png differ
diff --git a/Common/Textures/Weapons/Plasma/FCP_Multiplas_Rifle.png b/Common/Textures/Things/Weapons/Plasma/FCP_Multiplas_Rifle.png
similarity index 100%
rename from Common/Textures/Weapons/Plasma/FCP_Multiplas_Rifle.png
rename to Common/Textures/Things/Weapons/Plasma/FCP_Multiplas_Rifle.png
diff --git a/Common/Textures/Things/Weapons/Plasma/FCP_PMG.png b/Common/Textures/Things/Weapons/Plasma/FCP_PMG.png
new file mode 100644
index 0000000..009667d
Binary files /dev/null and b/Common/Textures/Things/Weapons/Plasma/FCP_PMG.png differ
diff --git a/Common/Textures/Things/Weapons/Plasma/FCP_P_94.png b/Common/Textures/Things/Weapons/Plasma/FCP_P_94.png
new file mode 100644
index 0000000..0abbc7f
Binary files /dev/null and b/Common/Textures/Things/Weapons/Plasma/FCP_P_94.png differ
diff --git a/Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Caster_mkI.png b/Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Caster_mkI.png
new file mode 100644
index 0000000..8d825b2
Binary files /dev/null and b/Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Caster_mkI.png differ
diff --git a/Common/Textures/Weapons/Plasma/FCP_Plasma_Caster.png b/Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Caster_mkII.png
similarity index 100%
rename from Common/Textures/Weapons/Plasma/FCP_Plasma_Caster.png
rename to Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Caster_mkII.png
diff --git a/Common/Textures/Weapons/Plasma/FCP_Plasma_Defender.png b/Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Defender.png
similarity index 100%
rename from Common/Textures/Weapons/Plasma/FCP_Plasma_Defender.png
rename to Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Defender.png
diff --git a/Common/Textures/Weapons/Plasma/FCP_Plasma_Pistol.png b/Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Pistol.png
similarity index 100%
rename from Common/Textures/Weapons/Plasma/FCP_Plasma_Pistol.png
rename to Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Pistol.png
diff --git a/Common/Textures/Weapons/Plasma/FCP_Plasma_Rifle.png b/Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Rifle.png
similarity index 100%
rename from Common/Textures/Weapons/Plasma/FCP_Plasma_Rifle.png
rename to Common/Textures/Things/Weapons/Plasma/FCP_Plasma_Rifle.png
diff --git a/Common/Textures/Weapons/Plasma/FCP_Q35_Matter_Modulator.png b/Common/Textures/Things/Weapons/Plasma/FCP_Q35_Matter_Modulator.png
similarity index 100%
rename from Common/Textures/Weapons/Plasma/FCP_Q35_Matter_Modulator.png
rename to Common/Textures/Things/Weapons/Plasma/FCP_Q35_Matter_Modulator.png
diff --git a/Common/Textures/Things/Weapons/Pulse/FCP_YK32_Pulse_Pistol.png b/Common/Textures/Things/Weapons/Pulse/FCP_YK32_Pulse_Pistol.png
new file mode 100644
index 0000000..65f04c8
Binary files /dev/null and b/Common/Textures/Things/Weapons/Pulse/FCP_YK32_Pulse_Pistol.png differ
diff --git a/Common/Textures/Things/Weapons/Pulse/FCP_YK42_Pulse_Rifle.png b/Common/Textures/Things/Weapons/Pulse/FCP_YK42_Pulse_Rifle.png
new file mode 100644
index 0000000..8f9c157
Binary files /dev/null and b/Common/Textures/Things/Weapons/Pulse/FCP_YK42_Pulse_Rifle.png differ
diff --git a/Common/Textures/Weapons/Laser/dks501.png b/Common/Textures/Weapons/Laser/dks501.png
deleted file mode 100644
index 69cc4f0..0000000
Binary files a/Common/Textures/Weapons/Laser/dks501.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/gatlinglaser.png b/Common/Textures/Weapons/Laser/gatlinglaser.png
deleted file mode 100644
index ac7493e..0000000
Binary files a/Common/Textures/Weapons/Laser/gatlinglaser.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/gausssniper.png b/Common/Textures/Weapons/Laser/gausssniper.png
deleted file mode 100644
index 9ded8f4..0000000
Binary files a/Common/Textures/Weapons/Laser/gausssniper.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/lasercarbine.png b/Common/Textures/Weapons/Laser/lasercarbine.png
deleted file mode 100644
index 9fb5017..0000000
Binary files a/Common/Textures/Weapons/Laser/lasercarbine.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/laserprojectilepulse.png b/Common/Textures/Weapons/Laser/laserprojectilepulse.png
deleted file mode 100644
index 3fc0123..0000000
Binary files a/Common/Textures/Weapons/Laser/laserprojectilepulse.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/m72a2.png b/Common/Textures/Weapons/Laser/m72a2.png
deleted file mode 100644
index 5dee5bb..0000000
Binary files a/Common/Textures/Weapons/Laser/m72a2.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/wattz1000.png b/Common/Textures/Weapons/Laser/wattz1000.png
deleted file mode 100644
index 4b7bed7..0000000
Binary files a/Common/Textures/Weapons/Laser/wattz1000.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/wattz2000.png b/Common/Textures/Weapons/Laser/wattz2000.png
deleted file mode 100644
index f89835c..0000000
Binary files a/Common/Textures/Weapons/Laser/wattz2000.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/yk32.png b/Common/Textures/Weapons/Laser/yk32.png
deleted file mode 100644
index 20f2719..0000000
Binary files a/Common/Textures/Weapons/Laser/yk32.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Laser/yk42.png b/Common/Textures/Weapons/Laser/yk42.png
deleted file mode 100644
index 094c71f..0000000
Binary files a/Common/Textures/Weapons/Laser/yk42.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Plasma/glock86.png b/Common/Textures/Weapons/Plasma/glock86.png
deleted file mode 100644
index 73370cb..0000000
Binary files a/Common/Textures/Weapons/Plasma/glock86.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Plasma/m94.png b/Common/Textures/Weapons/Plasma/m94.png
deleted file mode 100644
index 5b33ae7..0000000
Binary files a/Common/Textures/Weapons/Plasma/m94.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Plasma/p94.png b/Common/Textures/Weapons/Plasma/p94.png
deleted file mode 100644
index 957859f..0000000
Binary files a/Common/Textures/Weapons/Plasma/p94.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Plasma/plasmacaster.png b/Common/Textures/Weapons/Plasma/plasmacaster.png
deleted file mode 100644
index ece7eca..0000000
Binary files a/Common/Textures/Weapons/Plasma/plasmacaster.png and /dev/null differ
diff --git a/Common/Textures/Weapons/Plasma/pmg.png b/Common/Textures/Weapons/Plasma/pmg.png
deleted file mode 100644
index b4a6ae2..0000000
Binary files a/Common/Textures/Weapons/Plasma/pmg.png and /dev/null differ