diff --git a/examples/SharpBrick.Cli/Commands/DevicesList.cs b/examples/SharpBrick.Cli/Commands/DevicesList.cs
index e360501..d7d1d03 100644
--- a/examples/SharpBrick.Cli/Commands/DevicesList.cs
+++ b/examples/SharpBrick.Cli/Commands/DevicesList.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Logging;
 using SharpBrick.PoweredUp.Bluetooth;
 using SharpBrick.PoweredUp.Functions;
-using SharpBrick.PoweredUp.Knowledge;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol;
 using SharpBrick.PoweredUp.Protocol.Messages;
 using SharpBrick.PoweredUp.WinRT;
diff --git a/examples/SharpBrick.Cli/Commands/DumpStaticPortInfo.cs b/examples/SharpBrick.Cli/Commands/DumpStaticPortInfo.cs
index e6b4590..9eea25a 100644
--- a/examples/SharpBrick.Cli/Commands/DumpStaticPortInfo.cs
+++ b/examples/SharpBrick.Cli/Commands/DumpStaticPortInfo.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Logging;
 using SharpBrick.PoweredUp.Bluetooth;
 using SharpBrick.PoweredUp.Functions;
-using SharpBrick.PoweredUp.Knowledge;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol;
 using SharpBrick.PoweredUp.Protocol.Messages;
 using SharpBrick.PoweredUp.Utils;
diff --git a/src/SharpBrick.PoweredUp/Functions/DiscoverPorts.cs b/src/SharpBrick.PoweredUp/Functions/DiscoverPorts.cs
index a72c049..07c89f2 100644
--- a/src/SharpBrick.PoweredUp/Functions/DiscoverPorts.cs
+++ b/src/SharpBrick.PoweredUp/Functions/DiscoverPorts.cs
@@ -2,8 +2,8 @@
 using System.Collections.Concurrent;
 using System.Linq;
 using System.Threading.Tasks;
-using SharpBrick.PoweredUp.Knowledge;
 using SharpBrick.PoweredUp.Protocol;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Messages;
 
 namespace SharpBrick.PoweredUp.Functions
diff --git a/src/SharpBrick.PoweredUp/Protocol/Formatter/MessageEncoder.cs b/src/SharpBrick.PoweredUp/Protocol/Formatter/MessageEncoder.cs
index bd9ac6b..ddc094e 100644
--- a/src/SharpBrick.PoweredUp/Protocol/Formatter/MessageEncoder.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/Formatter/MessageEncoder.cs
@@ -1,5 +1,5 @@
 using System;
-using SharpBrick.PoweredUp.Knowledge;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Messages;
 
 namespace SharpBrick.PoweredUp.Protocol.Formatter
diff --git a/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueCombinedModeEncoder.cs b/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueCombinedModeEncoder.cs
index 22e10cc..15c4db5 100644
--- a/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueCombinedModeEncoder.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueCombinedModeEncoder.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SharpBrick.PoweredUp.Knowledge;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Messages;
 
 namespace SharpBrick.PoweredUp.Protocol.Formatter
diff --git a/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueSingleEncoder.cs b/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueSingleEncoder.cs
index 81871b6..766559f 100644
--- a/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueSingleEncoder.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/Formatter/PortValueSingleEncoder.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using SharpBrick.PoweredUp.Knowledge;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Messages;
 
 namespace SharpBrick.PoweredUp.Protocol.Formatter
diff --git a/src/SharpBrick.PoweredUp/Knowledge/KnowledgeManager.cs b/src/SharpBrick.PoweredUp/Protocol/Knowledge/KnowledgeManager.cs
similarity index 99%
rename from src/SharpBrick.PoweredUp/Knowledge/KnowledgeManager.cs
rename to src/SharpBrick.PoweredUp/Protocol/Knowledge/KnowledgeManager.cs
index 62971be..0c8e554 100644
--- a/src/SharpBrick.PoweredUp/Knowledge/KnowledgeManager.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/Knowledge/KnowledgeManager.cs
@@ -5,7 +5,7 @@
 using SharpBrick.PoweredUp.Protocol.Formatter;
 using SharpBrick.PoweredUp.Protocol.Messages;
 
-namespace SharpBrick.PoweredUp.Knowledge
+namespace SharpBrick.PoweredUp.Protocol.Knowledge
 {
     public static class KnowledgeManager
     {
diff --git a/src/SharpBrick.PoweredUp/Knowledge/PortInfo.cs b/src/SharpBrick.PoweredUp/Protocol/Knowledge/PortInfo.cs
similarity index 96%
rename from src/SharpBrick.PoweredUp/Knowledge/PortInfo.cs
rename to src/SharpBrick.PoweredUp/Protocol/Knowledge/PortInfo.cs
index db97353..f7c1582 100644
--- a/src/SharpBrick.PoweredUp/Knowledge/PortInfo.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/Knowledge/PortInfo.cs
@@ -1,7 +1,7 @@
 using System;
 using SharpBrick.PoweredUp.Protocol.Messages;
 
-namespace SharpBrick.PoweredUp.Knowledge
+namespace SharpBrick.PoweredUp.Protocol.Knowledge
 {
     public class PortInfo
     {
diff --git a/src/SharpBrick.PoweredUp/Knowledge/PortModeInfo.cs b/src/SharpBrick.PoweredUp/Protocol/Knowledge/PortModeInfo.cs
similarity index 97%
rename from src/SharpBrick.PoweredUp/Knowledge/PortModeInfo.cs
rename to src/SharpBrick.PoweredUp/Protocol/Knowledge/PortModeInfo.cs
index 6aac4e3..07d92a8 100644
--- a/src/SharpBrick.PoweredUp/Knowledge/PortModeInfo.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/Knowledge/PortModeInfo.cs
@@ -1,6 +1,6 @@
 using SharpBrick.PoweredUp.Protocol.Messages;
 
-namespace SharpBrick.PoweredUp.Knowledge
+namespace SharpBrick.PoweredUp.Protocol.Knowledge
 {
     public class PortModeInfo
     {
diff --git a/src/SharpBrick.PoweredUp/Knowledge/ProtocolKnowledge.cs b/src/SharpBrick.PoweredUp/Protocol/Knowledge/ProtocolKnowledge.cs
similarity index 94%
rename from src/SharpBrick.PoweredUp/Knowledge/ProtocolKnowledge.cs
rename to src/SharpBrick.PoweredUp/Protocol/Knowledge/ProtocolKnowledge.cs
index 3166eec..c9c92df 100644
--- a/src/SharpBrick.PoweredUp/Knowledge/ProtocolKnowledge.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/Knowledge/ProtocolKnowledge.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SharpBrick.PoweredUp.Knowledge
+namespace SharpBrick.PoweredUp.Protocol.Knowledge
 {
     public class ProtocolKnowledge
     {
diff --git a/src/SharpBrick.PoweredUp/Protocol/PoweredUpProtocol.cs b/src/SharpBrick.PoweredUp/Protocol/PoweredUpProtocol.cs
index b3cc75c..e0d2ab2 100644
--- a/src/SharpBrick.PoweredUp/Protocol/PoweredUpProtocol.cs
+++ b/src/SharpBrick.PoweredUp/Protocol/PoweredUpProtocol.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Linq;
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using SharpBrick.PoweredUp.Bluetooth;
-using SharpBrick.PoweredUp.Devices;
-using SharpBrick.PoweredUp.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Formatter;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Messages;
 
 namespace SharpBrick.PoweredUp.Protocol
diff --git a/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueCombinedModeEncoderTest.cs b/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueCombinedModeEncoderTest.cs
index 074f020..e029b8d 100644
--- a/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueCombinedModeEncoderTest.cs
+++ b/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueCombinedModeEncoderTest.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
-using SharpBrick.PoweredUp.Devices;
-using SharpBrick.PoweredUp.Knowledge;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Messages;
 using SharpBrick.PoweredUp.Utils;
 using Xunit;
diff --git a/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueEncoderTest.cs b/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueEncoderTest.cs
index 280543f..aad3bea 100644
--- a/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueEncoderTest.cs
+++ b/test/SharpBrick.PoweredUp.Test/Protocol/Formatter/PortValueEncoderTest.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
-using SharpBrick.PoweredUp.Devices;
-using SharpBrick.PoweredUp.Knowledge;
+using SharpBrick.PoweredUp.Protocol.Knowledge;
 using SharpBrick.PoweredUp.Protocol.Messages;
 using SharpBrick.PoweredUp.Utils;
 using Xunit;