diff --git a/Cafe.Matcha/Network/NetworkMonitor.cs b/Cafe.Matcha/Network/NetworkMonitor.cs
index 9fd7f6d..3cb6673 100644
--- a/Cafe.Matcha/Network/NetworkMonitor.cs
+++ b/Cafe.Matcha/Network/NetworkMonitor.cs
@@ -5,14 +5,12 @@ namespace Cafe.Matcha.Network
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
     using System.Numerics;
     using System.Text;
     using System.Threading;
     using Cafe.Matcha.Constant;
     using Cafe.Matcha.DTO;
-    using Cafe.Matcha.Models;
-    using Cafe.Matcha.Network.Universalis;
+    using Cafe.Matcha.Network.Structures;
     using Cafe.Matcha.Utils;
 
     internal interface INetworkMonitor
diff --git a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardCurrentOfferings.cs b/Cafe.Matcha/Network/Structures/IMarketBoardCurrentOfferings.cs
similarity index 98%
rename from Cafe.Matcha/Network/Universalis/Structures/IMarketBoardCurrentOfferings.cs
rename to Cafe.Matcha/Network/Structures/IMarketBoardCurrentOfferings.cs
index fbe18c8..ee38a9a 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardCurrentOfferings.cs
+++ b/Cafe.Matcha/Network/Structures/IMarketBoardCurrentOfferings.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System.Collections.Generic;
 
diff --git a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardHistory.cs b/Cafe.Matcha/Network/Structures/IMarketBoardHistory.cs
similarity index 97%
rename from Cafe.Matcha/Network/Universalis/Structures/IMarketBoardHistory.cs
rename to Cafe.Matcha/Network/Structures/IMarketBoardHistory.cs
index c4f38c7..86c30e9 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardHistory.cs
+++ b/Cafe.Matcha/Network/Structures/IMarketBoardHistory.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System;
     using System.Collections.Generic;
diff --git a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardPurchase.cs b/Cafe.Matcha/Network/Structures/IMarketBoardPurchase.cs
similarity index 92%
rename from Cafe.Matcha/Network/Universalis/Structures/IMarketBoardPurchase.cs
rename to Cafe.Matcha/Network/Structures/IMarketBoardPurchase.cs
index 551e8ef..a0fff2f 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardPurchase.cs
+++ b/Cafe.Matcha/Network/Structures/IMarketBoardPurchase.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     /// <summary>
     /// An interface that represents market board purchase information. This message is received from the
diff --git a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardPurchaseHandler.cs b/Cafe.Matcha/Network/Structures/IMarketBoardPurchaseHandler.cs
similarity index 96%
rename from Cafe.Matcha/Network/Universalis/Structures/IMarketBoardPurchaseHandler.cs
rename to Cafe.Matcha/Network/Structures/IMarketBoardPurchaseHandler.cs
index 06222c1..9b099a4 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/IMarketBoardPurchaseHandler.cs
+++ b/Cafe.Matcha/Network/Structures/IMarketBoardPurchaseHandler.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     /// <summary>
     /// An interface that represents market board purchase information. This message is sent from the
diff --git a/Cafe.Matcha/Network/Universalis/Structures/IMarketTaxRates.cs b/Cafe.Matcha/Network/Structures/IMarketTaxRates.cs
similarity index 97%
rename from Cafe.Matcha/Network/Universalis/Structures/IMarketTaxRates.cs
rename to Cafe.Matcha/Network/Structures/IMarketTaxRates.cs
index bfe741a..49e7f86 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/IMarketTaxRates.cs
+++ b/Cafe.Matcha/Network/Structures/IMarketTaxRates.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System;
 
diff --git a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardCurrentOfferings.cs b/Cafe.Matcha/Network/Structures/MarketBoardCurrentOfferings.cs
similarity index 99%
rename from Cafe.Matcha/Network/Universalis/Structures/MarketBoardCurrentOfferings.cs
rename to Cafe.Matcha/Network/Structures/MarketBoardCurrentOfferings.cs
index db50ac2..4fcb522 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardCurrentOfferings.cs
+++ b/Cafe.Matcha/Network/Structures/MarketBoardCurrentOfferings.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System;
     using System.Collections.Generic;
diff --git a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardHistory.cs b/Cafe.Matcha/Network/Structures/MarketBoardHistory.cs
similarity index 99%
rename from Cafe.Matcha/Network/Universalis/Structures/MarketBoardHistory.cs
rename to Cafe.Matcha/Network/Structures/MarketBoardHistory.cs
index a5b459a..c285fb7 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardHistory.cs
+++ b/Cafe.Matcha/Network/Structures/MarketBoardHistory.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System;
     using System.Collections.Generic;
diff --git a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardItemRequest.cs b/Cafe.Matcha/Network/Structures/MarketBoardItemRequest.cs
similarity index 97%
rename from Cafe.Matcha/Network/Universalis/Structures/MarketBoardItemRequest.cs
rename to Cafe.Matcha/Network/Structures/MarketBoardItemRequest.cs
index d41a20d..0206b90 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardItemRequest.cs
+++ b/Cafe.Matcha/Network/Structures/MarketBoardItemRequest.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System.Collections.Generic;
     using System.IO;
diff --git a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardPurchase.cs b/Cafe.Matcha/Network/Structures/MarketBoardPurchase.cs
similarity index 97%
rename from Cafe.Matcha/Network/Universalis/Structures/MarketBoardPurchase.cs
rename to Cafe.Matcha/Network/Structures/MarketBoardPurchase.cs
index ddbd215..bd74c35 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardPurchase.cs
+++ b/Cafe.Matcha/Network/Structures/MarketBoardPurchase.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System.IO;
 
diff --git a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardPurchaseHandler.cs b/Cafe.Matcha/Network/Structures/MarketBoardPurchaseHandler.cs
similarity index 98%
rename from Cafe.Matcha/Network/Universalis/Structures/MarketBoardPurchaseHandler.cs
rename to Cafe.Matcha/Network/Structures/MarketBoardPurchaseHandler.cs
index f799d19..dcb4f3e 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/MarketBoardPurchaseHandler.cs
+++ b/Cafe.Matcha/Network/Structures/MarketBoardPurchaseHandler.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System.IO;
     using System.Windows.Markup;
diff --git a/Cafe.Matcha/Network/Universalis/Structures/MarketTaxRates.cs b/Cafe.Matcha/Network/Structures/MarketTaxRates.cs
similarity index 99%
rename from Cafe.Matcha/Network/Universalis/Structures/MarketTaxRates.cs
rename to Cafe.Matcha/Network/Structures/MarketTaxRates.cs
index 5784a62..993eeca 100644
--- a/Cafe.Matcha/Network/Universalis/Structures/MarketTaxRates.cs
+++ b/Cafe.Matcha/Network/Structures/MarketTaxRates.cs
@@ -1,4 +1,4 @@
-namespace Cafe.Matcha.Network.Universalis
+namespace Cafe.Matcha.Network.Structures
 {
     using System;
     using System.IO;
diff --git a/Cafe.Matcha/Network/Universalis/Api.cs b/Cafe.Matcha/Network/Universalis/Api.cs
index c0af97b..6208feb 100644
--- a/Cafe.Matcha/Network/Universalis/Api.cs
+++ b/Cafe.Matcha/Network/Universalis/Api.cs
@@ -4,6 +4,7 @@ namespace Cafe.Matcha.Network.Universalis
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using Cafe.Matcha.Network.Structures;
     using Cafe.Matcha.Utils;
     using Newtonsoft.Json;
 
diff --git a/Cafe.Matcha/Network/Universalis/PacketProcessor.cs b/Cafe.Matcha/Network/Universalis/PacketProcessor.cs
index 4dffdf1..47b5868 100644
--- a/Cafe.Matcha/Network/Universalis/PacketProcessor.cs
+++ b/Cafe.Matcha/Network/Universalis/PacketProcessor.cs
@@ -7,6 +7,7 @@
     using System.Reactive.Linq;
     using System.Threading.Tasks;
     using Cafe.Matcha.Constant;
+    using Cafe.Matcha.Network.Structures;
 
     internal class PacketProcessor : IDisposable
     {