diff --git a/OF DL/Crypto/CryptoUtils.cs b/OF DL/Crypto/CryptoUtils.cs
index d433133..05f4c67 100644
--- a/OF DL/Crypto/CryptoUtils.cs	
+++ b/OF DL/Crypto/CryptoUtils.cs	
@@ -1,10 +1,10 @@
-using Org.BouncyCastle.Crypto;
+using System.Security.Cryptography;
+using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Engines;
 using Org.BouncyCastle.Crypto.Macs;
 using Org.BouncyCastle.Crypto.Parameters;
-using System.Security.Cryptography;
 
-namespace WidevineClient.Crypto
+namespace OF_DL.Crypto
 {
     public class CryptoUtils
     {
diff --git a/OF DL/Crypto/Padding.cs b/OF DL/Crypto/Padding.cs
index 34b5ec7..f819ea8 100644
--- a/OF DL/Crypto/Padding.cs	
+++ b/OF DL/Crypto/Padding.cs	
@@ -1,6 +1,6 @@
 using System.Security.Cryptography;
 
-namespace WidevineClient.Crypto
+namespace OF_DL.Crypto
 {
     public class Padding
     {
diff --git a/OF DL/Program.cs b/OF DL/Program.cs
index 6cc38a0..54d6934 100644
--- a/OF DL/Program.cs	
+++ b/OF DL/Program.cs	
@@ -463,7 +463,7 @@ public class Program(IServiceProvider serviceProvider)
 				Environment.Exit(4);
 			}
 
-			if (!File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_client_id_blob")))
+			if (!File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_client_id_blob")))
 			{
 				clientIdBlobMissing = true;
 				Log.Debug("clientIdBlobMissing missing");
@@ -471,10 +471,10 @@ public class Program(IServiceProvider serviceProvider)
 			else
 			{
 				AnsiConsole.Markup($"[green]device_client_id_blob located successfully![/]\n");
-				Log.Debug("clientIdBlobMissing found: " + File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_client_id_blob")));
+				Log.Debug("clientIdBlobMissing found: " + File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_client_id_blob")));
 			}
 
-			if (!File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_private_key")))
+			if (!File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_private_key")))
 			{
 				devicePrivateKeyMissing = true;
 				Log.Debug("devicePrivateKeyMissing missing");
@@ -482,7 +482,7 @@ public class Program(IServiceProvider serviceProvider)
 			else
 			{
 				AnsiConsole.Markup($"[green]device_private_key located successfully![/]\n");
-				Log.Debug("devicePrivateKeyMissing found: " + File.Exists(Path.Join(WidevineClient.Widevine.Constants.DEVICES_FOLDER, WidevineClient.Widevine.Constants.DEVICE_NAME, "device_private_key")));
+				Log.Debug("devicePrivateKeyMissing found: " + File.Exists(Path.Join(Constants.DEVICES_FOLDER, Constants.DEVICE_NAME, "device_private_key")));
 			}
 
 			if (clientIdBlobMissing || devicePrivateKeyMissing)
diff --git a/OF DL/Utils/HttpUtil.cs b/OF DL/Utils/HttpUtil.cs
index 89f3ec1..a239547 100644
--- a/OF DL/Utils/HttpUtil.cs	
+++ b/OF DL/Utils/HttpUtil.cs	
@@ -1,7 +1,7 @@
 using OF_DL.Helpers;
 using System.Text;
 
-namespace WidevineClient
+namespace OF_DL.Utils
 {
     class HttpUtil
     {
diff --git a/OF DL/Widevine/CDM.cs b/OF DL/Widevine/CDM.cs
index 6b5f6fc..963da77 100644
--- a/OF DL/Widevine/CDM.cs	
+++ b/OF DL/Widevine/CDM.cs	
@@ -1,10 +1,10 @@
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Text;
+using OF_DL.Crypto;
 using ProtoBuf;
-using WidevineClient.Crypto;
 
-namespace WidevineClient.Widevine
+namespace OF_DL.Widevine
 {
     public class CDM
     {
diff --git a/OF DL/Widevine/CDMApi.cs b/OF DL/Widevine/CDMApi.cs
index 662377b..4e0f1d9 100644
--- a/OF DL/Widevine/CDMApi.cs	
+++ b/OF DL/Widevine/CDMApi.cs	
@@ -1,6 +1,4 @@
-using WidevineClient.Widevine;
-
-namespace OF_DL.Widevine
+namespace OF_DL.Widevine
 {
     public class CDMApi
     {
diff --git a/OF DL/Widevine/CDMDevice.cs b/OF DL/Widevine/CDMDevice.cs
index 78b9ea4..7dc4023 100644
--- a/OF DL/Widevine/CDMDevice.cs	
+++ b/OF DL/Widevine/CDMDevice.cs	
@@ -7,7 +7,7 @@ using Org.BouncyCastle.Crypto.Signers;
 using Org.BouncyCastle.OpenSsl;
 using ProtoBuf;
 
-namespace WidevineClient.Widevine
+namespace OF_DL.Widevine
 {
     public class CDMDevice
     {
diff --git a/OF DL/Widevine/Constants.cs b/OF DL/Widevine/Constants.cs
index a206c2f..a692eb2 100644
--- a/OF DL/Widevine/Constants.cs	
+++ b/OF DL/Widevine/Constants.cs	
@@ -1,4 +1,4 @@
-namespace WidevineClient.Widevine
+namespace OF_DL.Widevine
 {
     public class Constants
     {
diff --git a/OF DL/Widevine/ContentKey.cs b/OF DL/Widevine/ContentKey.cs
index 9810225..8b611dd 100644
--- a/OF DL/Widevine/ContentKey.cs	
+++ b/OF DL/Widevine/ContentKey.cs	
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
 
-namespace WidevineClient.Widevine
+namespace OF_DL.Widevine
 {
     [Serializable]
     public class ContentKey
diff --git a/OF DL/Widevine/DerivedKeys.cs b/OF DL/Widevine/DerivedKeys.cs
index 27b95be..fdcebec 100644
--- a/OF DL/Widevine/DerivedKeys.cs	
+++ b/OF DL/Widevine/DerivedKeys.cs	
@@ -1,4 +1,4 @@
-namespace WidevineClient.Widevine
+namespace OF_DL.Widevine
 {
     public class DerivedKeys
     {