diff --git a/src/openvic-simulation/InstanceManager.hpp b/src/openvic-simulation/InstanceManager.hpp
index 4695b0a4..ac924d21 100644
--- a/src/openvic-simulation/InstanceManager.hpp
+++ b/src/openvic-simulation/InstanceManager.hpp
@@ -5,7 +5,7 @@
 #include "openvic-simulation/console/ConsoleInstance.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/diplomacy/CountryRelation.hpp"
-#include "openvic-simulation/economy/GoodInstance.hpp"
+#include "openvic-simulation/economy/trading/GoodInstance.hpp"
 #include "openvic-simulation/economy/trading/MarketInstance.hpp"
 #include "openvic-simulation/map/MapInstance.hpp"
 #include "openvic-simulation/map/Mapmode.hpp"
diff --git a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
index bc68f178..c869969e 100644
--- a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
+++ b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
@@ -1,7 +1,7 @@
 #include "ArtisanalProducer.hpp"
 
-#include "openvic-simulation/economy/GoodInstance.hpp"
 #include "openvic-simulation/economy/production/ProductionType.hpp"
+#include "openvic-simulation/economy/trading/GoodInstance.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/pop/Pop.hpp"
diff --git a/src/openvic-simulation/economy/production/ArtisanalProducerFactoryPattern.cpp b/src/openvic-simulation/economy/production/ArtisanalProducerFactoryPattern.cpp
index 286d4539..0acc442c 100644
--- a/src/openvic-simulation/economy/production/ArtisanalProducerFactoryPattern.cpp
+++ b/src/openvic-simulation/economy/production/ArtisanalProducerFactoryPattern.cpp
@@ -1,5 +1,5 @@
 #include "ArtisanalProducerFactoryPattern.hpp"
-#include "openvic-simulation/economy/GoodInstance.hpp"
+#include "openvic-simulation/economy/trading/GoodInstance.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/economy/GoodInstance.cpp b/src/openvic-simulation/economy/trading/GoodInstance.cpp
similarity index 100%
rename from src/openvic-simulation/economy/GoodInstance.cpp
rename to src/openvic-simulation/economy/trading/GoodInstance.cpp
diff --git a/src/openvic-simulation/economy/GoodInstance.hpp b/src/openvic-simulation/economy/trading/GoodInstance.hpp
similarity index 100%
rename from src/openvic-simulation/economy/GoodInstance.hpp
rename to src/openvic-simulation/economy/trading/GoodInstance.hpp
diff --git a/src/openvic-simulation/economy/trading/MarketInstance.hpp b/src/openvic-simulation/economy/trading/MarketInstance.hpp
index 629f5af3..11be2f92 100644
--- a/src/openvic-simulation/economy/trading/MarketInstance.hpp
+++ b/src/openvic-simulation/economy/trading/MarketInstance.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/economy/GoodInstance.hpp"
+#include "openvic-simulation/economy/trading/GoodInstance.hpp"
 #include "openvic-simulation/economy/trading/BuyUpToOrder.hpp"
 #include "openvic-simulation/economy/trading/MarketSellOrder.hpp"