diff --git a/ChocolArm64/CpuThread.cs b/ChocolArm64/CpuThread.cs
index 87b213957d..6cd34f8127 100644
--- a/ChocolArm64/CpuThread.cs
+++ b/ChocolArm64/CpuThread.cs
@@ -1,5 +1,6 @@
 using ChocolArm64.Memory;
 using ChocolArm64.State;
+using ChocolArm64.Translation;
 using System;
 using System.Threading;
 
diff --git a/ChocolArm64/State/CpuThreadState.cs b/ChocolArm64/State/CpuThreadState.cs
index 2ea03ba150..abec60bb2e 100644
--- a/ChocolArm64/State/CpuThreadState.cs
+++ b/ChocolArm64/State/CpuThreadState.cs
@@ -1,4 +1,5 @@
 using ChocolArm64.Events;
+using ChocolArm64.Translation;
 using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
diff --git a/ChocolArm64/TranslatedSub.cs b/ChocolArm64/Translation/TranslatedSub.cs
similarity index 98%
rename from ChocolArm64/TranslatedSub.cs
rename to ChocolArm64/Translation/TranslatedSub.cs
index bca084365f..b1601e944d 100644
--- a/ChocolArm64/TranslatedSub.cs
+++ b/ChocolArm64/Translation/TranslatedSub.cs
@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace ChocolArm64
+namespace ChocolArm64.Translation
 {
     class TranslatedSub
     {
diff --git a/ChocolArm64/TranslationTier.cs b/ChocolArm64/Translation/TranslationTier.cs
similarity index 74%
rename from ChocolArm64/TranslationTier.cs
rename to ChocolArm64/Translation/TranslationTier.cs
index 345ee1babe..13afd9c5fa 100644
--- a/ChocolArm64/TranslationTier.cs
+++ b/ChocolArm64/Translation/TranslationTier.cs
@@ -1,4 +1,4 @@
-namespace ChocolArm64
+namespace ChocolArm64.Translation
 {
     enum TranslationTier
     {
diff --git a/ChocolArm64/Translator.cs b/ChocolArm64/Translation/Translator.cs
similarity index 99%
rename from ChocolArm64/Translator.cs
rename to ChocolArm64/Translation/Translator.cs
index a094d5f42a..afe25cebbf 100644
--- a/ChocolArm64/Translator.cs
+++ b/ChocolArm64/Translation/Translator.cs
@@ -2,11 +2,10 @@ using ChocolArm64.Decoders;
 using ChocolArm64.Events;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
-using ChocolArm64.Translation;
 using System;
 using System.Threading;
 
-namespace ChocolArm64
+namespace ChocolArm64.Translation
 {
     public class Translator
     {
diff --git a/ChocolArm64/TranslatorCache.cs b/ChocolArm64/Translation/TranslatorCache.cs
similarity index 99%
rename from ChocolArm64/TranslatorCache.cs
rename to ChocolArm64/Translation/TranslatorCache.cs
index 3013fae470..d10d6757ba 100644
--- a/ChocolArm64/TranslatorCache.cs
+++ b/ChocolArm64/Translation/TranslatorCache.cs
@@ -4,7 +4,7 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
-namespace ChocolArm64
+namespace ChocolArm64.Translation
 {
     class TranslatorCache
     {
diff --git a/ChocolArm64/TranslatorQueue.cs b/ChocolArm64/Translation/TranslatorQueue.cs
similarity index 91%
rename from ChocolArm64/TranslatorQueue.cs
rename to ChocolArm64/Translation/TranslatorQueue.cs
index cc20843111..3d71108bc8 100644
--- a/ChocolArm64/TranslatorQueue.cs
+++ b/ChocolArm64/Translation/TranslatorQueue.cs
@@ -1,10 +1,12 @@
 using System.Collections.Concurrent;
 using System.Threading;
 
-namespace ChocolArm64
+namespace ChocolArm64.Translation
 {
     class TranslatorQueue
     {
+        //This is the maximum numbers of functions that the queue can hold to be translated.
+        //The value may need some tuning to find the sweet spot.
         private const int MaxQueueSize = 1024;
 
         private ConcurrentStack<TranslatorQueueItem>[] _translationQueue;
diff --git a/ChocolArm64/TranslatorQueueItem.cs b/ChocolArm64/Translation/TranslatorQueueItem.cs
similarity index 92%
rename from ChocolArm64/TranslatorQueueItem.cs
rename to ChocolArm64/Translation/TranslatorQueueItem.cs
index 2f42851a3c..0988414a50 100644
--- a/ChocolArm64/TranslatorQueueItem.cs
+++ b/ChocolArm64/Translation/TranslatorQueueItem.cs
@@ -1,6 +1,6 @@
 using ChocolArm64.State;
 
-namespace ChocolArm64
+namespace ChocolArm64.Translation
 {
     struct TranslatorQueueItem
     {
diff --git a/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs b/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs
index f11660b4a9..9ff3b36a3b 100644
--- a/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs
+++ b/Ryujinx.Graphics/Graphics3d/NvGpuEngine3d.cs
@@ -100,7 +100,7 @@ namespace Ryujinx.Graphics.Graphics3d
             SetCullFace(State);
             SetDepth(State);
             SetStencil(State);
-            //SetScissor(State);
+            SetScissor(State);
             SetBlending(State);
             SetColorMask(State);
             SetPrimitiveRestart(State);
diff --git a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
index a25963b8e9..338e5543d7 100644
--- a/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs
@@ -1,6 +1,7 @@
 using ChocolArm64;
 using ChocolArm64.Events;
 using ChocolArm64.Memory;
+using ChocolArm64.Translation;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
 using Ryujinx.HLE.Exceptions;
diff --git a/Ryujinx.Tests/Cpu/CpuTest.cs b/Ryujinx.Tests/Cpu/CpuTest.cs
index 439d6fae17..47feb573eb 100644
--- a/Ryujinx.Tests/Cpu/CpuTest.cs
+++ b/Ryujinx.Tests/Cpu/CpuTest.cs
@@ -1,6 +1,7 @@
 using ChocolArm64;
 using ChocolArm64.Memory;
 using ChocolArm64.State;
+using ChocolArm64.Translation;
 
 using NUnit.Framework;