diff --git a/Quik/CommandQueue/Command.cs b/Quik/CommandMachine/Command.cs
similarity index 97%
rename from Quik/CommandQueue/Command.cs
rename to Quik/CommandMachine/Command.cs
index c65f60c..fb75607 100644
--- a/Quik/CommandQueue/Command.cs
+++ b/Quik/CommandMachine/Command.cs
@@ -1,4 +1,4 @@
-namespace Quik.CommandQueue
+namespace Quik.CommandMachine
 {
     /// <summary>
     /// Enumeration of built-in Quik commands.
diff --git a/Quik/CommandQueue/CommandEngine.cs b/Quik/CommandMachine/CommandEngine.cs
similarity index 99%
rename from Quik/CommandQueue/CommandEngine.cs
rename to Quik/CommandMachine/CommandEngine.cs
index 5f91ee9..0c3ef89 100644
--- a/Quik/CommandQueue/CommandEngine.cs
+++ b/Quik/CommandMachine/CommandEngine.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Quik.CommandQueue
+namespace Quik.CommandMachine
 {
     public class CommandEngine
     {
diff --git a/Quik/CommandQueue/CommandHandler.cs b/Quik/CommandMachine/CommandHandler.cs
similarity index 88%
rename from Quik/CommandQueue/CommandHandler.cs
rename to Quik/CommandMachine/CommandHandler.cs
index 50dc6f9..62f31ac 100644
--- a/Quik/CommandQueue/CommandHandler.cs
+++ b/Quik/CommandMachine/CommandHandler.cs
@@ -1,4 +1,4 @@
-namespace Quik.CommandQueue
+namespace Quik.CommandMachine
 {
     /// <summary>
     /// A delegate for a QUIK command.
diff --git a/Quik/CommandQueue/CommandQueue.cs b/Quik/CommandMachine/CommandQueue.cs
similarity index 99%
rename from Quik/CommandQueue/CommandQueue.cs
rename to Quik/CommandMachine/CommandQueue.cs
index 7368e6f..fbd1cc9 100644
--- a/Quik/CommandQueue/CommandQueue.cs
+++ b/Quik/CommandMachine/CommandQueue.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Quik.CommandQueue
+namespace Quik.CommandMachine
 {
     public class CommandQueue : Queue<Frame>
     {
diff --git a/Quik/CommandQueue/Frame.cs b/Quik/CommandMachine/Frame.cs
similarity index 99%
rename from Quik/CommandQueue/Frame.cs
rename to Quik/CommandMachine/Frame.cs
index d793aec..40f8078 100644
--- a/Quik/CommandQueue/Frame.cs
+++ b/Quik/CommandMachine/Frame.cs
@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace Quik.CommandQueue
+namespace Quik.CommandMachine
 {
     [StructLayout(LayoutKind.Explicit)]
     public struct Frame
diff --git a/Quik/CommandQueue/FrameType.cs b/Quik/CommandMachine/FrameType.cs
similarity index 87%
rename from Quik/CommandQueue/FrameType.cs
rename to Quik/CommandMachine/FrameType.cs
index 6bc6344..989c67c 100644
--- a/Quik/CommandQueue/FrameType.cs
+++ b/Quik/CommandMachine/FrameType.cs
@@ -1,4 +1,4 @@
-namespace Quik.CommandQueue
+namespace Quik.CommandMachine
 {
     public enum FrameType
     {
diff --git a/Quik/CommandQueue/ImageCommandFlags.cs b/Quik/CommandMachine/ImageCommandFlags.cs
similarity index 79%
rename from Quik/CommandQueue/ImageCommandFlags.cs
rename to Quik/CommandMachine/ImageCommandFlags.cs
index 1374183..dda5b0b 100644
--- a/Quik/CommandQueue/ImageCommandFlags.cs
+++ b/Quik/CommandMachine/ImageCommandFlags.cs
@@ -1,4 +1,4 @@
-namespace Quik.CommandQueue
+namespace Quik.CommandMachine
 {
     public enum ImageCommandFlags
     {