Some organization

IAmBatby · Oct 20, 2017 · aa5711d · aa5711d
1 parent bdf71e4
commit aa5711d
Show file tree

Hide file tree

Showing 181 changed files with 319 additions and 147 deletions.
diff --git a/Items/AbyssBreastplate.cs → Items/Abyss/AbyssBreastplate.cs b/Items/AbyssBreastplate.cs → Items/Abyss/AbyssBreastplate.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Abyss
 {
 	[AutoloadEquip(EquipType.Body)]
 	public class AbyssBreastplate : ModItem

diff --git a/Items/AbyssBreastplate.png → Items/Abyss/AbyssBreastplate.png b/Items/AbyssBreastplate.png → Items/Abyss/AbyssBreastplate.png
diff --git a/Items/AbyssBreastplate_Arms.png → Items/Abyss/AbyssBreastplate_Arms.png b/Items/AbyssBreastplate_Arms.png → Items/Abyss/AbyssBreastplate_Arms.png
diff --git a/Items/AbyssBreastplate_Body.png → Items/Abyss/AbyssBreastplate_Body.png b/Items/AbyssBreastplate_Body.png → Items/Abyss/AbyssBreastplate_Body.png
diff --git a/Items/AbyssBreastplate_FemaleBody.png → Items/Abyss/AbyssBreastplate_FemaleBody.png b/Items/AbyssBreastplate_FemaleBody.png → Items/Abyss/AbyssBreastplate_FemaleBody.png
diff --git a/Items/AbyssGreaves.cs → Items/Abyss/AbyssGreaves.cs b/Items/AbyssGreaves.cs → Items/Abyss/AbyssGreaves.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Abyss
 {
 	[AutoloadEquip(EquipType.Legs)]
 	public class AbyssGreaves : ModItem

diff --git a/Items/AbyssGreaves.png → Items/Abyss/AbyssGreaves.png b/Items/AbyssGreaves.png → Items/Abyss/AbyssGreaves.png
diff --git a/Items/AbyssGreaves_Legs.png → Items/Abyss/AbyssGreaves_Legs.png b/Items/AbyssGreaves_Legs.png → Items/Abyss/AbyssGreaves_Legs.png
diff --git a/Items/AbyssHeadgear.cs → Items/Abyss/AbyssHeadgear.cs b/Items/AbyssHeadgear.cs → Items/Abyss/AbyssHeadgear.cs
@@ -4,7 +4,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Abyss
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class AbyssHeadgear : ModItem

diff --git a/Items/AbyssHeadgear.png → Items/Abyss/AbyssHeadgear.png b/Items/AbyssHeadgear.png → Items/Abyss/AbyssHeadgear.png
diff --git a/Items/AbyssHeadgear_Head.png → Items/Abyss/AbyssHeadgear_Head.png b/Items/AbyssHeadgear_Head.png → Items/Abyss/AbyssHeadgear_Head.png
diff --git a/Items/Abyss/desktop.ini b/Items/Abyss/desktop.ini
@@ -0,0 +1,9 @@
+[LocalizedFileNames]
+AbyssHeadgear_Head.png=@AbyssHeadgear_Head.png,0
+AbyssGreaves.png[email protected],0
+AbyssGreaves_Legs.png=@AbyssGreaves_Legs.png,0
+AbyssHeadgear.png[email protected],0
+AbyssBreastplate_Body.png=@AbyssBreastplate_Body.png,0
+AbyssBreastplate_FemaleBody.png=@AbyssBreastplate_FemaleBody.png,0
+AbyssBreastplate.png[email protected],0
+AbyssBreastplate_Arms.png=@AbyssBreastplate_Arms.png,0
diff --git a/Items/AdamantiteDisc.cs → Items/Adamantite/AdamantiteDisc.cs b/Items/AdamantiteDisc.cs → Items/Adamantite/AdamantiteDisc.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Adamantite
 {
 	public class AdamantiteDisc : ModItem
 	{

diff --git a/Items/AdamantiteDisc.png → Items/Adamantite/AdamantiteDisc.png b/Items/AdamantiteDisc.png → Items/Adamantite/AdamantiteDisc.png
diff --git a/Items/AdamantiteHat.cs → Items/Adamantite/AdamantiteHat.cs b/Items/AdamantiteHat.cs → Items/Adamantite/AdamantiteHat.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Adamantite
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class AdamantiteHat : ModItem

diff --git a/Items/AdamantiteHat.png → Items/Adamantite/AdamantiteHat.png b/Items/AdamantiteHat.png → Items/Adamantite/AdamantiteHat.png
diff --git a/Items/AdamantiteHat_Head.png → Items/Adamantite/AdamantiteHat_Head.png b/Items/AdamantiteHat_Head.png → Items/Adamantite/AdamantiteHat_Head.png
diff --git a/Items/AdamantiteHeader.cs → Items/Adamantite/AdamantiteHeader.cs b/Items/AdamantiteHeader.cs → Items/Adamantite/AdamantiteHeader.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Adamantite
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class AdamantiteHeader : ModItem

diff --git a/Items/AdamantiteHeader.png → Items/Adamantite/AdamantiteHeader.png b/Items/AdamantiteHeader.png → Items/Adamantite/AdamantiteHeader.png
diff --git a/Items/AdamantiteHeader_Head.png → Items/Adamantite/AdamantiteHeader_Head.png b/Items/AdamantiteHeader_Head.png → Items/Adamantite/AdamantiteHeader_Head.png
diff --git a/Items/AdamantiteRifle.cs → Items/Adamantite/AdamantiteRifle.cs b/Items/AdamantiteRifle.cs → Items/Adamantite/AdamantiteRifle.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Adamantite
 {
 	public class AdamantiteRifle : ModItem
 	{

diff --git a/Items/AdamantiteRifle.png → Items/Adamantite/AdamantiteRifle.png b/Items/AdamantiteRifle.png → Items/Adamantite/AdamantiteRifle.png
diff --git a/Items/AdamantiteStaff.cs → Items/Adamantite/AdamantiteStaff.cs b/Items/AdamantiteStaff.cs → Items/Adamantite/AdamantiteStaff.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Adamantite
 {
 	public class AdamantiteStaff : ModItem
 	{

diff --git a/Items/AdamantiteStaff.png → Items/Adamantite/AdamantiteStaff.png b/Items/AdamantiteStaff.png → Items/Adamantite/AdamantiteStaff.png
diff --git a/Items/AdamantiteVisage.cs → Items/Adamantite/AdamantiteVisage.cs b/Items/AdamantiteVisage.cs → Items/Adamantite/AdamantiteVisage.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Adamantite
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class AdamantiteVisage : ModItem

diff --git a/Items/AdamantiteVisage.png → Items/Adamantite/AdamantiteVisage.png b/Items/AdamantiteVisage.png → Items/Adamantite/AdamantiteVisage.png
diff --git a/Items/AdamantiteVisage_Head.png → Items/Adamantite/AdamantiteVisage_Head.png b/Items/AdamantiteVisage_Head.png → Items/Adamantite/AdamantiteVisage_Head.png
diff --git a/Items/AdamantiteWarhammer.cs → Items/Adamantite/AdamantiteWarhammer.cs b/Items/AdamantiteWarhammer.cs → Items/Adamantite/AdamantiteWarhammer.cs
@@ -1,7 +1,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Adamantite
 {
 	public class AdamantiteWarhammer : ModItem
 	{

diff --git a/Items/AdamantiteWarhammer.png → Items/Adamantite/AdamantiteWarhammer.png b/Items/AdamantiteWarhammer.png → Items/Adamantite/AdamantiteWarhammer.png
diff --git a/Items/Adamantite/desktop.ini b/Items/Adamantite/desktop.ini
@@ -0,0 +1,11 @@
+[LocalizedFileNames]
+AdamantiteStaff.png[email protected],0
+AdamantiteVisage_Head.png=@AdamantiteVisage_Head.png,0
+AdamantiteVisage.png[email protected],0
+AdamantiteWarhammer.png[email protected],0
+AdamantiteHeader_Head.png=@AdamantiteHeader_Head.png,0
+AdamantiteRifle.png[email protected],0
+AdamantiteHeader.png[email protected],0
+AdamantiteHat.png[email protected],0
+AdamantiteHat_Head.png=@AdamantiteHat_Head.png,0
+AdamantiteDisc.png[email protected],0
diff --git a/Items/AlchemasterMask.cs → Items/Alchemist/AlchemasterMask.cs b/Items/AlchemasterMask.cs → Items/Alchemist/AlchemasterMask.cs
@@ -1,6 +1,6 @@
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	[AutoloadEquip(EquipType.Head)]
 	public class AlchemasterMask : ModItem

diff --git a/Items/AlchemasterMask.png → Items/Alchemist/AlchemasterMask.png b/Items/AlchemasterMask.png → Items/Alchemist/AlchemasterMask.png
diff --git a/Items/AlchemasterMask_Head.png → Items/Alchemist/AlchemasterMask_Head.png b/Items/AlchemasterMask_Head.png → Items/Alchemist/AlchemasterMask_Head.png
diff --git a/Items/AlchemasterTreasureBag.cs → Items/Alchemist/AlchemasterTreasureBag.cs b/Items/AlchemasterTreasureBag.cs → Items/Alchemist/AlchemasterTreasureBag.cs
@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemasterTreasureBag : ModItem
 	{

diff --git a/Items/AlchemasterTreasureBag.png → Items/Alchemist/AlchemasterTreasureBag.png b/Items/AlchemasterTreasureBag.png → Items/Alchemist/AlchemasterTreasureBag.png
diff --git a/Items/AlchemasterTrophy.cs → Items/Alchemist/AlchemasterTrophy.cs b/Items/AlchemasterTrophy.cs → Items/Alchemist/AlchemasterTrophy.cs
@@ -1,6 +1,6 @@
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemasterTrophy : ModItem
 	{

diff --git a/Items/AlchemasterTrophy.png → Items/Alchemist/AlchemasterTrophy.png b/Items/AlchemasterTrophy.png → Items/Alchemist/AlchemasterTrophy.png
diff --git a/Items/Alchemator.cs → Items/Alchemist/Alchemator.cs b/Items/Alchemator.cs → Items/Alchemist/Alchemator.cs
@@ -1,7 +1,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class Alchemator : ModItem
 	{

diff --git a/Items/Alchemator.png → Items/Alchemist/Alchemator.png b/Items/Alchemator.png → Items/Alchemist/Alchemator.png
diff --git a/Items/AlchemistEmblem.cs → Items/Alchemist/AlchemistEmblem.cs b/Items/AlchemistEmblem.cs → Items/Alchemist/AlchemistEmblem.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemistEmblem : ModItem
 	{

diff --git a/Items/AlchemistEmblem.png → Items/Alchemist/AlchemistEmblem.png b/Items/AlchemistEmblem.png → Items/Alchemist/AlchemistEmblem.png
diff --git a/Items/AlchemistFocus.cs → Items/Alchemist/AlchemistFocus.cs b/Items/AlchemistFocus.cs → Items/Alchemist/AlchemistFocus.cs
@@ -3,7 +3,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemistFocus : ModItem
 	{

diff --git a/Items/AlchemistFocus.png → Items/Alchemist/AlchemistFocus.png b/Items/AlchemistFocus.png → Items/Alchemist/AlchemistFocus.png
diff --git a/Items/AlchemistGlove.cs → Items/Alchemist/AlchemistGlove.cs b/Items/AlchemistGlove.cs → Items/Alchemist/AlchemistGlove.cs
@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemistGlove : ModItem
 	{

diff --git a/Items/AlchemistGlove.png → Items/Alchemist/AlchemistGlove.png b/Items/AlchemistGlove.png → Items/Alchemist/AlchemistGlove.png
diff --git a/Items/AlchemistSoul.cs → Items/Alchemist/AlchemistSoul.cs b/Items/AlchemistSoul.cs → Items/Alchemist/AlchemistSoul.cs
@@ -2,7 +2,7 @@
 using Terraria.DataStructures;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemistSoul : ModItem
 	{

diff --git a/Items/AlchemistSoul.png → Items/Alchemist/AlchemistSoul.png b/Items/AlchemistSoul.png → Items/Alchemist/AlchemistSoul.png
diff --git a/Items/AlchemistSpark.cs → Items/Alchemist/AlchemistSpark.cs b/Items/AlchemistSpark.cs → Items/Alchemist/AlchemistSpark.cs
@@ -2,7 +2,7 @@
 using Terraria.DataStructures;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemistSpark : ModItem
 	{

diff --git a/Items/AlchemistSpark.png → Items/Alchemist/AlchemistSpark.png b/Items/AlchemistSpark.png → Items/Alchemist/AlchemistSpark.png
diff --git a/Items/AlchemyStation.cs → Items/Alchemist/AlchemyStation.cs b/Items/AlchemyStation.cs → Items/Alchemist/AlchemyStation.cs
@@ -1,7 +1,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist
 {
 	public class AlchemyStation : ModItem
 	{

diff --git a/Items/AlchemyStation.png → Items/Alchemist/AlchemyStation.png b/Items/AlchemyStation.png → Items/Alchemist/AlchemyStation.png
diff --git a/Items/BasicFlask.cs → Items/Alchemist/Flasks/BasicFlask.cs b/Items/BasicFlask.cs → Items/Alchemist/Flasks/BasicFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class BasicFlask : AlchemistItem
 	{

diff --git a/Items/BasicFlask.png → Items/Alchemist/Flasks/BasicFlask.png b/Items/BasicFlask.png → Items/Alchemist/Flasks/BasicFlask.png
diff --git a/Items/BigManaFlask.cs → Items/Alchemist/Flasks/BigManaFlask.cs b/Items/BigManaFlask.cs → Items/Alchemist/Flasks/BigManaFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class BigManaFlask : AlchemistItem
 	{

diff --git a/Items/BigManaFlask.png → Items/Alchemist/Flasks/BigManaFlask.png b/Items/BigManaFlask.png → Items/Alchemist/Flasks/BigManaFlask.png
diff --git a/Items/BigPoisonFlask.cs → Items/Alchemist/Flasks/BigPoisonFlask.cs b/Items/BigPoisonFlask.cs → Items/Alchemist/Flasks/BigPoisonFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class BigPoisonFlask : AlchemistItem
 	{

diff --git a/Items/BigPoisonFlask.png → Items/Alchemist/Flasks/BigPoisonFlask.png b/Items/BigPoisonFlask.png → Items/Alchemist/Flasks/BigPoisonFlask.png
diff --git a/Items/BigVenomFlask.cs → Items/Alchemist/Flasks/BigVenomFlask.cs b/Items/BigVenomFlask.cs → Items/Alchemist/Flasks/BigVenomFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class BigVenomFlask : AlchemistItem
 	{

diff --git a/Items/BigVenomFlask.png → Items/Alchemist/Flasks/BigVenomFlask.png b/Items/BigVenomFlask.png → Items/Alchemist/Flasks/BigVenomFlask.png
diff --git a/Items/BoomFlask.cs → Items/Alchemist/Flasks/BoomFlask.cs b/Items/BoomFlask.cs → Items/Alchemist/Flasks/BoomFlask.cs
@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class BoomFlask : AlchemistItem
 	{

diff --git a/Items/BoomFlask.png → Items/Alchemist/Flasks/BoomFlask.png b/Items/BoomFlask.png → Items/Alchemist/Flasks/BoomFlask.png
diff --git a/Items/BurningFlask.cs → Items/Alchemist/Flasks/BurningFlask.cs b/Items/BurningFlask.cs → Items/Alchemist/Flasks/BurningFlask.cs
@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class BurningFlask : AlchemistItem
 	{

diff --git a/Items/BurningFlask.png → Items/Alchemist/Flasks/BurningFlask.png b/Items/BurningFlask.png → Items/Alchemist/Flasks/BurningFlask.png
diff --git a/Items/ClusterFlask.cs → Items/Alchemist/Flasks/ClusterFlask.cs b/Items/ClusterFlask.cs → Items/Alchemist/Flasks/ClusterFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class ClusterFlask : AlchemistItem
 	{

diff --git a/Items/ClusterFlask.png → Items/Alchemist/Flasks/ClusterFlask.png b/Items/ClusterFlask.png → Items/Alchemist/Flasks/ClusterFlask.png
diff --git a/Items/CrystalFlask.cs → Items/Alchemist/Flasks/CrystalFlask.cs b/Items/CrystalFlask.cs → Items/Alchemist/Flasks/CrystalFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class CrystalFlask : AlchemistItem
 	{

diff --git a/Items/CrystalFlask.png → Items/Alchemist/Flasks/CrystalFlask.png b/Items/CrystalFlask.png → Items/Alchemist/Flasks/CrystalFlask.png
diff --git a/Items/DukeFlask.cs → Items/Alchemist/Flasks/DukeFlask.cs b/Items/DukeFlask.cs → Items/Alchemist/Flasks/DukeFlask.cs
@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class DukeFlask : AlchemistItem
 	{

diff --git a/Items/DukeFlask.png → Items/Alchemist/Flasks/DukeFlask.png b/Items/DukeFlask.png → Items/Alchemist/Flasks/DukeFlask.png
diff --git a/Items/ExtendedBoomFlask.cs → Items/Alchemist/Flasks/ExtendedBoomFlask.cs b/Items/ExtendedBoomFlask.cs → Items/Alchemist/Flasks/ExtendedBoomFlask.cs
@@ -1,9 +1,8 @@
-using System.Linq;
 using Terraria;
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class ExtendedBoomFlask : AlchemistItem
 	{

diff --git a/Items/ExtendedBoomFlask.png → Items/Alchemist/Flasks/ExtendedBoomFlask.png b/Items/ExtendedBoomFlask.png → Items/Alchemist/Flasks/ExtendedBoomFlask.png
diff --git a/Items/ExtendedBurningFlask.cs → .../Alchemist/Flasks/ExtendedBurningFlask.cs b/Items/ExtendedBurningFlask.cs → .../Alchemist/Flasks/ExtendedBurningFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class ExtendedBurningFlask : AlchemistItem
 	{

diff --git a/Items/ExtendedBurningFlask.png → ...Alchemist/Flasks/ExtendedBurningFlask.png b/Items/ExtendedBurningFlask.png → ...Alchemist/Flasks/ExtendedBurningFlask.png
diff --git a/Items/ExtendedFreezeFlask.cs → ...s/Alchemist/Flasks/ExtendedFreezeFlask.cs b/Items/ExtendedFreezeFlask.cs → ...s/Alchemist/Flasks/ExtendedFreezeFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class ExtendedFreezeFlask : AlchemistItem
 	{

diff --git a/Items/ExtendedFreezeFlask.png → .../Alchemist/Flasks/ExtendedFreezeFlask.png b/Items/ExtendedFreezeFlask.png → .../Alchemist/Flasks/ExtendedFreezeFlask.png
diff --git a/Items/FlaskCore.cs → Items/Alchemist/Flasks/FlaskCore.cs b/Items/FlaskCore.cs → Items/Alchemist/Flasks/FlaskCore.cs
@@ -1,8 +1,7 @@
-using System.Linq;
 using Terraria;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class FlaskCore : ModItem
 	{

diff --git a/Items/FlaskCore.png → Items/Alchemist/Flasks/FlaskCore.png b/Items/FlaskCore.png → Items/Alchemist/Flasks/FlaskCore.png
diff --git a/Items/FreezeFlask.cs → Items/Alchemist/Flasks/FreezeFlask.cs b/Items/FreezeFlask.cs → Items/Alchemist/Flasks/FreezeFlask.cs
@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class FreezeFlask : AlchemistItem
 	{

diff --git a/Items/FreezeFlask.png → Items/Alchemist/Flasks/FreezeFlask.png b/Items/FreezeFlask.png → Items/Alchemist/Flasks/FreezeFlask.png
diff --git a/Items/GoldFlask.cs → Items/Alchemist/Flasks/GoldFlask.cs b/Items/GoldFlask.cs → Items/Alchemist/Flasks/GoldFlask.cs
@@ -1,7 +1,7 @@
 using Terraria;
 using Terraria.ID;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class GoldFlask : AlchemistItem
 	{

diff --git a/Items/GoldFlask.png → Items/Alchemist/Flasks/GoldFlask.png b/Items/GoldFlask.png → Items/Alchemist/Flasks/GoldFlask.png
diff --git a/Items/HealthSupportFlask.cs → Items/Alchemist/Flasks/HealthSupportFlask.cs b/Items/HealthSupportFlask.cs → Items/Alchemist/Flasks/HealthSupportFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class HealthSupportFlask : ModItem
 	{

diff --git a/Items/HealthSupportFlask.png → ...s/Alchemist/Flasks/HealthSupportFlask.png b/Items/HealthSupportFlask.png → ...s/Alchemist/Flasks/HealthSupportFlask.png
diff --git a/Items/LesserManaFlask.cs → Items/Alchemist/Flasks/LesserManaFlask.cs b/Items/LesserManaFlask.cs → Items/Alchemist/Flasks/LesserManaFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class LesserManaFlask : AlchemistItem
 	{

diff --git a/Items/LesserManaFlask.png → Items/Alchemist/Flasks/LesserManaFlask.png b/Items/LesserManaFlask.png → Items/Alchemist/Flasks/LesserManaFlask.png
diff --git a/Items/LesserPoisonFlask.cs → Items/Alchemist/Flasks/LesserPoisonFlask.cs b/Items/LesserPoisonFlask.cs → Items/Alchemist/Flasks/LesserPoisonFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class LesserPoisonFlask : AlchemistItem
 	{

diff --git a/Items/LesserPoisonFlask.png → Items/Alchemist/Flasks/LesserPoisonFlask.png b/Items/LesserPoisonFlask.png → Items/Alchemist/Flasks/LesserPoisonFlask.png
diff --git a/Items/LesserVenomFlask.cs → Items/Alchemist/Flasks/LesserVenomFlask.cs b/Items/LesserVenomFlask.cs → Items/Alchemist/Flasks/LesserVenomFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class LesserVenomFlask : AlchemistItem
 	{

diff --git a/Items/LesserVenomFlask.png → Items/Alchemist/Flasks/LesserVenomFlask.png b/Items/LesserVenomFlask.png → Items/Alchemist/Flasks/LesserVenomFlask.png
diff --git a/Items/ManaSupportFlask.cs → Items/Alchemist/Flasks/ManaSupportFlask.cs b/Items/ManaSupportFlask.cs → Items/Alchemist/Flasks/ManaSupportFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class ManaSupportFlask : ModItem
 	{

diff --git a/Items/ManaSupportFlask.png → Items/Alchemist/Flasks/ManaSupportFlask.png b/Items/ManaSupportFlask.png → Items/Alchemist/Flasks/ManaSupportFlask.png
diff --git a/Items/MoonDustFlask.cs → Items/Alchemist/Flasks/MoonDustFlask.cs b/Items/MoonDustFlask.cs → Items/Alchemist/Flasks/MoonDustFlask.cs
@@ -2,7 +2,7 @@
 using Terraria.ID;
 using Terraria.ModLoader;
 
-namespace Tremor.Items
+namespace Tremor.Items.Alchemist.Flasks
 {
 	public class MoonDustFlask : AlchemistItem
 	{

diff --git a/Items/MoonDustFlask.png → Items/Alchemist/Flasks/MoonDustFlask.png b/Items/MoonDustFlask.png → Items/Alchemist/Flasks/MoonDustFlask.png