diff --git a/extern/hqn/hqn.cpp b/extern/hqn/hqn.cpp
index bb45f84..fc75347 100644
--- a/extern/hqn/hqn.cpp
+++ b/extern/hqn/hqn.cpp
@@ -10,7 +10,7 @@ namespace hqn
 int32_t *_initF_VideoPalette()
 {
     static int32_t VideoPalette[512];
-    const Nes_Emu::rgb_t *palette = Nes_Emu::nes_colors;
+    const emulator_t::rgb_t *palette = emulator_t::nes_colors;
     for (int i = 0; i < 512; i++)
     {
         VideoPalette[i] = palette[i].red << 16 | palette[i].green << 8
@@ -25,7 +25,7 @@ const int32_t *HQNState::NES_VIDEO_PALETTE = _initF_VideoPalette();
 // Constructor
 HQNState::HQNState()
 {
-    m_emu = new Nes_Emu();
+    m_emu = new emulator_t();
     joypad[0] = 0x00;
     joypad[1] = 0x00;
 
@@ -50,7 +50,7 @@ error_t HQNState::setSampleRate(int rate)
 {
 	const char *ret = m_emu->set_sample_rate(rate);
 	if (!ret)
-		m_emu->set_equalizer(Nes_Emu::nes_eq);
+		m_emu->set_equalizer(emulator_t::nes_eq);
 	return ret;
 }
 
diff --git a/extern/hqn/hqn.h b/extern/hqn/hqn.h
index 3a1dee8..ab250da 100644
--- a/extern/hqn/hqn.h
+++ b/extern/hqn/hqn.h
@@ -7,6 +7,17 @@
 
 #define BLIT_SIZE 65536
 
+// Creating emulator instance
+#ifdef _USE_QUICKNES
+  typedef Nes_Emu emulator_t;
+#endif
+
+#ifdef _USE_QUICKERNES
+  typedef quickerNES::Nes_Emu emulator_t;
+#endif
+
+
+
 namespace hqn
 {
 
@@ -36,7 +47,7 @@ class HQNState
 public:
 
     /* A reference to the emulator instance. */
-    Nes_Emu *m_emu;
+    emulator_t *m_emu;
 
     static const int32_t *NES_VIDEO_PALETTE;
 
@@ -46,7 +57,7 @@ public:
     HQNState();
     ~HQNState();
 
-    void setEmulatorPointer(void* const emuPtr) { m_emu = (Nes_Emu*)emuPtr; }
+    void setEmulatorPointer(void* const emuPtr) { m_emu = (emulator_t*)emuPtr; }
 
     /*
     The joypad data for the two joypads available to an NES.
@@ -55,7 +66,7 @@ public:
     uint32_t joypad[2];
 
     /* Get the emulator this state uses. */
-    inline Nes_Emu *emu() const
+    inline emulator_t *emu() const
     { return m_emu; }
 
 
@@ -146,7 +157,7 @@ inline void saveBlit(const void *ePtr, int32_t *dest, const int32_t *colors, int
 {
     // what is the point of the 256 color bitmap and the dynamic color allocation to it?
     // why not just render directly to a 512 color bitmap with static palette positions?
-//    Nes_Emu *e = m_emu; // e was a parameter but since this is now part of a class, it's just in here
+//    emulator_t *e = m_emu; // e was a parameter but since this is now part of a class, it's just in here
 //    const int srcpitch = e->frame().pitch;
 //    const unsigned char *src = e->frame().pixels;
 //    const unsigned char *const srcend = src + (e->image_height - cropbottom) * srcpitch;
@@ -166,16 +177,16 @@ inline void saveBlit(const void *ePtr, int32_t *dest, const int32_t *colors, int
 //        }
 //    }
 
- const Nes_Emu *e = (Nes_Emu*) ePtr;
+ const emulator_t *e = (emulator_t*) ePtr;
  const unsigned char *in_pixels = e->frame().pixels;
  if (in_pixels == NULL) return;
  int32_t *out_pixels = dest;
 
- for (unsigned h = 0; h < Nes_Emu::image_height;  h++, in_pixels += e->frame().pitch, out_pixels += Nes_Emu::image_width)
-  for (unsigned w = 0; w < Nes_Emu::image_width; w++)
+ for (unsigned h = 0; h < emulator_t::image_height;  h++, in_pixels += e->frame().pitch, out_pixels += emulator_t::image_width)
+  for (unsigned w = 0; w < emulator_t::image_width; w++)
   {
      unsigned col = e->frame().palette[in_pixels[w]];
-     const Nes_Emu::rgb_t& rgb = e->nes_colors[col];
+     const emulator_t::rgb_t& rgb = e->nes_colors[col];
      unsigned r = rgb.red;
      unsigned g = rgb.green;
      unsigned b = rgb.blue;
diff --git a/source/playbackInstance.hpp b/source/playbackInstance.hpp
index 185b970..3852e60 100644
--- a/source/playbackInstance.hpp
+++ b/source/playbackInstance.hpp
@@ -11,7 +11,14 @@
 
 #define _INVERSE_FRAME_RATE 16667
 
-class Nes_Emu;
+// Creating emulator instance
+#ifdef _USE_QUICKNES
+  typedef Nes_Emu emulator_t;
+#endif
+
+#ifdef _USE_QUICKERNES
+  typedef quickerNES::Nes_Emu emulator_t;
+#endif
 
 struct stepData_t
 {
@@ -43,8 +50,8 @@ class PlaybackInstance
 
     // Loading Emulator instance HQN
     _hqnState.setEmulatorPointer(_emu->getInternalEmulatorPointer());
-    static uint8_t video_buffer[Nes_Emu::image_width * Nes_Emu::image_height];
-    _hqnState.m_emu->set_pixels(video_buffer, Nes_Emu::image_width + 8);
+    static uint8_t video_buffer[emulator_t::image_width * emulator_t::image_height];
+    _hqnState.m_emu->set_pixels(video_buffer, emulator_t::image_width + 8);
 
     // Building sequence information
     for (const auto &input : sequence)
diff --git a/source/player.cpp b/source/player.cpp
index ff5c888..6ddae77 100644
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef _USE_QUICKERNES
-  auto e = QuickerNESInstance();
+  auto e = quickerNES::QuickerNESInstance();
 #endif
 
   // Loading ROM File
diff --git a/source/quickerNES/Nes_Cart.hpp b/source/quickerNES/Nes_Cart.hpp
index 1c58ee4..064620e 100644
--- a/source/quickerNES/Nes_Cart.hpp
+++ b/source/quickerNES/Nes_Cart.hpp
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 #include <cstdlib>
 #include <cstring>
 
+namespace quickerNES
+{
+
 class Nes_Cart
 {
   public:
@@ -110,3 +113,5 @@ class Nes_Cart
   long chr_size_;
   unsigned mapper;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/Nes_Core.hpp b/source/quickerNES/Nes_Core.hpp
index 2dc1213..ddc5716 100644
--- a/source/quickerNES/Nes_Core.hpp
+++ b/source/quickerNES/Nes_Core.hpp
@@ -22,6 +22,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 #include <cstdio>
 #include <string>
 
+namespace quickerNES
+{
+
 class Nes_Cart;
 
 #undef NES_EMU_CPU_HOOK
@@ -598,7 +601,7 @@ class Nes_Core : private Nes_Cpu
 
     // extra byte allows CPU to always read operand of instruction, which
     // might go past end of data
-    uint8_t unmapped_page[::Nes_Cpu::page_size + 1];
+    uint8_t unmapped_page[Nes_Cpu::page_size + 1];
   };
   impl_t *impl; // keep large arrays separate
   unsigned long error_count;
@@ -1043,3 +1046,5 @@ inline void Nes_Core::cpu_write(nes_addr_t addr, int data, nes_time_t time)
     else                                                         \
       static_cast<Nes_Core &>(*cpu).cpu_write(addr, data, time); \
   }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/Nes_Cpu.cpp b/source/quickerNES/Nes_Cpu.cpp
index 2ccf3f3..92573dc 100644
--- a/source/quickerNES/Nes_Cpu.cpp
+++ b/source/quickerNES/Nes_Cpu.cpp
@@ -22,6 +22,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 #define st_n 0x80
 #define st_v 0x40
 #define st_r 0x20
@@ -1163,4 +1166,6 @@ uint8_t clock_table [256] = {
     3,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7,// D
     2,6,2,8,3,3,5,5,2,2,2,2,4,4,6,6,// E
     3,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7 // F
-};
\ No newline at end of file
+};
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/Nes_Cpu.hpp b/source/quickerNES/Nes_Cpu.hpp
index 813737c..42e54a3 100644
--- a/source/quickerNES/Nes_Cpu.hpp
+++ b/source/quickerNES/Nes_Cpu.hpp
@@ -5,6 +5,9 @@
 
 #include <cstdint>
 
+namespace quickerNES
+{
+
 typedef long nes_time_t;     // clock cycle count
 typedef unsigned nes_addr_t; // 16-bit address
 
@@ -136,3 +139,5 @@ class Nes_Cpu
     return (uint8_t *)code_map[addr >> page_bits] + addr;
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/Nes_Emu.cpp b/source/quickerNES/Nes_Emu.cpp
index 9b0e7f4..f5cfe88 100644
--- a/source/quickerNES/Nes_Emu.cpp
+++ b/source/quickerNES/Nes_Emu.cpp
@@ -15,6 +15,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 int const sound_fade_size = 384;
 
 Nes_Emu::equalizer_t const Nes_Emu::nes_eq     = {  -1.0,   80 };
@@ -441,3 +444,5 @@ void Nes_Emu::RestoreAudioBufferState()
 	sound_buf_changed_count = extra_sound_buf_changed_count;
 	sound_buf->RestoreAudioBufferState();
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/Nes_Emu.hpp b/source/quickerNES/Nes_Emu.hpp
index f907e2a..46686a6 100644
--- a/source/quickerNES/Nes_Emu.hpp
+++ b/source/quickerNES/Nes_Emu.hpp
@@ -8,6 +8,9 @@
 #include "Nes_Core.hpp"
 #include "apu/Multi_Buffer.hpp"
 
+namespace quickerNES
+{
+
 class Nes_State;
 
 class Nes_Emu
@@ -281,3 +284,5 @@ inline long Nes_Emu::chr_size() const
 {
   return cart()->chr_size() ? cart()->chr_size() : emu.ppu.chr_addr_size;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Blip_Buffer.cpp b/source/quickerNES/apu/Blip_Buffer.cpp
index 148ae51..7252d7b 100644
--- a/source/quickerNES/apu/Blip_Buffer.cpp
+++ b/source/quickerNES/apu/Blip_Buffer.cpp
@@ -18,6 +18,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 int const buffer_extra = blip_widest_impulse_ + 2;
 
 Blip_Buffer::Blip_Buffer()
@@ -415,3 +418,5 @@ void Blip_Buffer::RestoreAudioBufferState()
   reader_accum = extra_reader_accum;
   memcpy(buffer_, extra_buffer, sizeof(extra_buffer));
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Blip_Buffer.hpp b/source/quickerNES/apu/Blip_Buffer.hpp
index 888d2f5..3cc9c50 100644
--- a/source/quickerNES/apu/Blip_Buffer.hpp
+++ b/source/quickerNES/apu/Blip_Buffer.hpp
@@ -1,10 +1,10 @@
+#pragma once
 
 // Band-limited sound synthesis and buffering
-
 // Blip_Buffer 0.4.0
 
-#ifndef BLIP_BUFFER_H
-#define BLIP_BUFFER_H
+namespace quickerNES
+{
 
 // Time unit at source clock rate
 typedef long blip_time_t;
@@ -377,4 +377,4 @@ inline int Blip_Reader::begin(Blip_Buffer &blip_buf)
 int const blip_max_length = 0;
 int const blip_default_length = 250;
 
-#endif
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Effects_Buffer.cpp b/source/quickerNES/apu/Effects_Buffer.cpp
index ebfb05e..707073e 100644
--- a/source/quickerNES/apu/Effects_Buffer.cpp
+++ b/source/quickerNES/apu/Effects_Buffer.cpp
@@ -14,6 +14,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 typedef long fixed_t;
 
 #define TO_FIXED(f) fixed_t((f) * (1L << 15) + 0.5)
@@ -511,3 +514,5 @@ void Effects_Buffer::mix_enhanced(blip_sample_t *out, long count)
   l2.end(bufs[5]);
   r2.end(bufs[6]);
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Effects_Buffer.hpp b/source/quickerNES/apu/Effects_Buffer.hpp
index 08be31d..4161862 100644
--- a/source/quickerNES/apu/Effects_Buffer.hpp
+++ b/source/quickerNES/apu/Effects_Buffer.hpp
@@ -6,6 +6,9 @@
 #include "Multi_Buffer.hpp"
 #include <stdint.h>
 
+namespace quickerNES
+{
+
 // Effects_Buffer uses several buffers and outputs stereo sample pairs.
 class Effects_Buffer : public Multi_Buffer
 {
@@ -97,3 +100,5 @@ inline Effects_Buffer::channel_t Effects_Buffer::channel(int i)
 {
   return channels[i % chan_count];
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Multi_Buffer.cpp b/source/quickerNES/apu/Multi_Buffer.cpp
index fc3fb99..e9a2353 100644
--- a/source/quickerNES/apu/Multi_Buffer.cpp
+++ b/source/quickerNES/apu/Multi_Buffer.cpp
@@ -15,6 +15,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 Multi_Buffer::Multi_Buffer(int spf) : samples_per_frame_(spf)
 {
   length_ = 0;
@@ -280,3 +283,5 @@ void Stereo_Buffer::RestoreAudioBufferState()
   center()->RestoreAudioBufferState();
   right()->RestoreAudioBufferState();
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Multi_Buffer.hpp b/source/quickerNES/apu/Multi_Buffer.hpp
index e17bde0..20a1ff3 100644
--- a/source/quickerNES/apu/Multi_Buffer.hpp
+++ b/source/quickerNES/apu/Multi_Buffer.hpp
@@ -6,6 +6,9 @@
 
 #include "Blip_Buffer.hpp"
 
+namespace quickerNES
+{
+
 // Interface to one or more Blip_Buffers mapped to one or more channels
 // consisting of left, center, and right buffers.
 class Multi_Buffer
@@ -195,3 +198,5 @@ inline void Mono_Buffer::bass_freq(int freq) { buf.bass_freq(freq); }
 inline long Mono_Buffer::read_samples(blip_sample_t *p, long s) { return buf.read_samples(p, s); }
 
 inline long Mono_Buffer::samples_avail() const { return buf.samples_avail(); }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Nes_Buffer.cpp b/source/quickerNES/apu/Nes_Buffer.cpp
index 1d279b0..477dd83 100644
--- a/source/quickerNES/apu/Nes_Buffer.cpp
+++ b/source/quickerNES/apu/Nes_Buffer.cpp
@@ -14,6 +14,9 @@ details. You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // Nes_Buffer
 
 Nes_Buffer::Nes_Buffer() : Multi_Buffer(1) {}
@@ -229,3 +232,5 @@ void Nes_Nonlinearizer::RestoreAudioBufferState()
   accum = extra_accum;
   prev = extra_prev;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Nes_Buffer.hpp b/source/quickerNES/apu/Nes_Buffer.hpp
index f8c16d7..b7e16d0 100644
--- a/source/quickerNES/apu/Nes_Buffer.hpp
+++ b/source/quickerNES/apu/Nes_Buffer.hpp
@@ -6,6 +6,9 @@
 #include "Multi_Buffer.hpp"
 #include <cstdint>
 
+namespace quickerNES
+{
+
 class Nes_Apu;
 
 class Nes_Nonlinearizer
@@ -75,3 +78,5 @@ class Nes_Buffer : public Multi_Buffer
   virtual void SaveAudioBufferState();
   virtual void RestoreAudioBufferState();
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Nes_Effects_Buffer.cpp b/source/quickerNES/apu/Nes_Effects_Buffer.cpp
index 5c63ba4..fb8a31a 100644
--- a/source/quickerNES/apu/Nes_Effects_Buffer.cpp
+++ b/source/quickerNES/apu/Nes_Effects_Buffer.cpp
@@ -15,6 +15,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 Nes_Effects_Buffer::Nes_Effects_Buffer() : Effects_Buffer(true) // nes never uses stereo channels
 {
   config_t c;
@@ -85,3 +88,5 @@ void Nes_Effects_Buffer::SaveAudioBufferState()
 void Nes_Effects_Buffer::RestoreAudioBufferState()
 {
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Nes_Effects_Buffer.hpp b/source/quickerNES/apu/Nes_Effects_Buffer.hpp
index b90bb91..c09e8ae 100644
--- a/source/quickerNES/apu/Nes_Effects_Buffer.hpp
+++ b/source/quickerNES/apu/Nes_Effects_Buffer.hpp
@@ -6,6 +6,9 @@
 #include "Effects_Buffer.hpp"
 #include "Nes_Buffer.hpp"
 
+namespace quickerNES
+{
+
 // Effects_Buffer uses several buffers and outputs stereo sample pairs.
 class Nes_Effects_Buffer : public Effects_Buffer
 {
@@ -34,3 +37,5 @@ class Nes_Effects_Buffer : public Effects_Buffer
   Nes_Nonlinearizer nonlin;
   friend Multi_Buffer *set_apu(Nes_Effects_Buffer *, Nes_Apu *);
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Nes_Oscs.cpp b/source/quickerNES/apu/Nes_Oscs.cpp
index 9dc738e..a164f8f 100644
--- a/source/quickerNES/apu/Nes_Oscs.cpp
+++ b/source/quickerNES/apu/Nes_Oscs.cpp
@@ -14,6 +14,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // Nes_Osc
 
 void Nes_Osc::clock_length(int halt_mask)
@@ -675,3 +678,5 @@ void Nes_Noise::run(nes_time_t time, nes_time_t end_time)
 
   delay = time - end_time;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/Nes_Oscs.hpp b/source/quickerNES/apu/Nes_Oscs.hpp
index 76da3c4..bf5e62f 100644
--- a/source/quickerNES/apu/Nes_Oscs.hpp
+++ b/source/quickerNES/apu/Nes_Oscs.hpp
@@ -6,6 +6,9 @@
 
 #include "Blip_Buffer.hpp"
 
+namespace quickerNES
+{
+
 class Nes_Apu;
 
 typedef long nes_time_t;     // CPU clock cycle count
@@ -165,3 +168,5 @@ struct Nes_Dmc : Nes_Osc
   int count_reads(nes_time_t, nes_time_t *) const;
   nes_time_t next_read_time() const;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/apu.cpp b/source/quickerNES/apu/apu.cpp
index ca80f49..bccdb0a 100644
--- a/source/quickerNES/apu/apu.cpp
+++ b/source/quickerNES/apu/apu.cpp
@@ -13,6 +13,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 int const amp_range = 15;
 
 Nes_Apu::Nes_Apu() : square1(&square_synth),
@@ -368,3 +371,5 @@ int Nes_Apu::read_status(nes_time_t time)
 
   return result;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/apu.hpp b/source/quickerNES/apu/apu.hpp
index a6c92ab..735f18c 100644
--- a/source/quickerNES/apu/apu.hpp
+++ b/source/quickerNES/apu/apu.hpp
@@ -3,9 +3,12 @@
 // NES 2A03 APU sound chip emulator
 // Nes_Snd_Emu 0.1.7
 
-#include "Nes_Oscs.hpp"
 #include <climits>
 #include <cstdint>
+#include "Nes_Oscs.hpp"
+
+namespace quickerNES
+{
 
 class Nes_Apu
 {
@@ -355,4 +358,6 @@ inline void Nes_Apu::load_state(apu_state_t const &state)
   triangle.run(last_time, last_time);
   noise.run(last_time, last_time);
   dmc.run(last_time, last_time);
-}
\ No newline at end of file
+}
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/fme7/apu.cpp b/source/quickerNES/apu/fme7/apu.cpp
index 1bf7190..2b52a83 100644
--- a/source/quickerNES/apu/fme7/apu.cpp
+++ b/source/quickerNES/apu/fme7/apu.cpp
@@ -15,6 +15,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 void Nes_Fme7_Apu::reset()
 {
   last_time = 0;
@@ -101,3 +104,5 @@ void Nes_Fme7_Apu::run_until(blip_time_t end_time)
 
   last_time = end_time;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/fme7/apu.hpp b/source/quickerNES/apu/fme7/apu.hpp
index e05672b..cb2b0fa 100644
--- a/source/quickerNES/apu/fme7/apu.hpp
+++ b/source/quickerNES/apu/fme7/apu.hpp
@@ -3,8 +3,11 @@
 // Sunsoft FME-7 sound emulator
 // Nes_Emu 0.7.0
 
-#include "apu/Blip_Buffer.hpp"
 #include <cstdint>
+#include "apu/Blip_Buffer.hpp"
+
+namespace quickerNES
+{
 
 struct fme7_apu_state_t
 {
@@ -148,3 +151,5 @@ inline void Nes_Fme7_Apu::load_state(fme7_apu_state_t const &in)
   // Run sound channels for 0 cycles for clean audio after loading state
   run_until(last_time);
 }
+
+} // namespace quickNES
diff --git a/source/quickerNES/apu/namco/apu.cpp b/source/quickerNES/apu/namco/apu.cpp
index e12dffd..2fac6d5 100644
--- a/source/quickerNES/apu/namco/apu.cpp
+++ b/source/quickerNES/apu/namco/apu.cpp
@@ -15,6 +15,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 Nes_Namco_Apu::Nes_Namco_Apu()
 {
   output(0);
@@ -176,3 +179,5 @@ void Nes_Namco_Apu::load_state(namco_state_t const &in)
 
   run_until(last_time);
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/namco/apu.hpp b/source/quickerNES/apu/namco/apu.hpp
index 4c6884e..63d06e8 100644
--- a/source/quickerNES/apu/namco/apu.hpp
+++ b/source/quickerNES/apu/namco/apu.hpp
@@ -3,8 +3,11 @@
 // Namco 106 sound chip emulator
 // Nes_Snd_Emu 0.1.7
 
-#include "apu/apu.hpp"
 #include <cstdint>
+#include "apu/apu.hpp"
+
+namespace quickerNES
+{
 
 struct namco_state_t
 {
@@ -108,3 +111,5 @@ inline void Nes_Namco_Apu::write_data(nes_time_t time, int data)
   run_until(time);
   access() = data;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc6/apu.cpp b/source/quickerNES/apu/vrc6/apu.cpp
index 15beee3..0872a23 100644
--- a/source/quickerNES/apu/vrc6/apu.cpp
+++ b/source/quickerNES/apu/vrc6/apu.cpp
@@ -14,6 +14,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 Nes_Vrc6_Apu::Nes_Vrc6_Apu()
 {
   output(0);
@@ -208,3 +211,5 @@ void Nes_Vrc6_Apu::run_saw(nes_time_t end_time)
 
   osc.last_amp = last_amp;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc6/apu.hpp b/source/quickerNES/apu/vrc6/apu.hpp
index 9de24f8..9674c8b 100644
--- a/source/quickerNES/apu/vrc6/apu.hpp
+++ b/source/quickerNES/apu/vrc6/apu.hpp
@@ -4,9 +4,12 @@
 // Konami VRC6 sound chip emulator
 // Nes_Snd_Emu 0.1.7
 
+#include <cstdint>
 #include "apu/Blip_Buffer.hpp"
 #include "apu/apu.hpp"
-#include <cstdint>
+
+namespace quickerNES
+{
 
 struct vrc6_apu_state_t;
 
@@ -105,3 +108,5 @@ inline void Nes_Vrc6_Apu::treble_eq(blip_eq_t const &eq)
   saw_synth.treble_eq(eq);
   square_synth.treble_eq(eq);
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc7/apu.cpp b/source/quickerNES/apu/vrc7/apu.cpp
index fca4338..445b319 100644
--- a/source/quickerNES/apu/vrc7/apu.cpp
+++ b/source/quickerNES/apu/vrc7/apu.cpp
@@ -1,6 +1,9 @@
+#include <cstring>
 #include "apu/vrc7/apu.hpp"
 #include "apu/vrc7/emu2413.hpp"
-#include <cstring>
+
+namespace quickerNES
+{
 
 #define BYTESWAP(xxxx)                                  \
   {                                                     \
@@ -204,3 +207,5 @@ void Nes_Vrc7::update_last_amp()
     }
   }
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc7/apu.hpp b/source/quickerNES/apu/vrc7/apu.hpp
index 0d0da3c..dd466ae 100644
--- a/source/quickerNES/apu/vrc7/apu.hpp
+++ b/source/quickerNES/apu/vrc7/apu.hpp
@@ -4,9 +4,12 @@
 // Konami VRC7 sound chip emulator
 // Nes_Snd_Emu 0.1.7. Copyright (C) 2003-2005 Shay Green. GNU LGPL license.
 
+#include <cstdint>
 #include "apu/Blip_Buffer.hpp"
 #include "apu/vrc7/emu2413_state.hpp"
-#include <cstdint>
+
+namespace quickerNES
+{
 
 struct vrc7_snapshot_t;
 typedef long nes_time_t;
@@ -72,3 +75,5 @@ inline void Nes_Vrc7::osc_output(int i, Blip_Buffer *buf)
 {
   oscs[i].output = buf;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc7/emu2413.cpp b/source/quickerNES/apu/vrc7/emu2413.cpp
index 8229dcf..37aa13e 100644
--- a/source/quickerNES/apu/vrc7/emu2413.cpp
+++ b/source/quickerNES/apu/vrc7/emu2413.cpp
@@ -61,6 +61,9 @@ if the origin of this software is not misrepresented.
 #include <stdlib.h>
 #include <string.h>
 
+namespace quickerNES
+{
+
 static const unsigned char default_inst[15][8] = {
   /* 2019-03-19 VRC7 instrument patchset dumped by Nuke.YKT */
   /* https://wiki.nesdev.com/w/index.php/VRC7_audio */
@@ -1148,3 +1151,5 @@ void OPLL_writeIO(OPLL *opll, e_uint32 adr, e_uint32 val)
   else
     opll->adr = val;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc7/emu2413.hpp b/source/quickerNES/apu/vrc7/emu2413.hpp
index 24be45b..4c508ae 100644
--- a/source/quickerNES/apu/vrc7/emu2413.hpp
+++ b/source/quickerNES/apu/vrc7/emu2413.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+namespace quickerNES
+{
+
 typedef signed int e_int;
 typedef unsigned int e_uint;
 typedef signed char e_int8;
@@ -216,3 +219,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc7/emu2413_state.cpp b/source/quickerNES/apu/vrc7/emu2413_state.cpp
index a544d4d..4fff23a 100644
--- a/source/quickerNES/apu/vrc7/emu2413_state.cpp
+++ b/source/quickerNES/apu/vrc7/emu2413_state.cpp
@@ -1,6 +1,9 @@
 #include "emu2413_state.hpp"
 #include <stdint.h>
 
+namespace quickerNES
+{
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -109,3 +112,5 @@ extern "C"
 #ifdef __cplusplus
 }
 #endif
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/apu/vrc7/emu2413_state.hpp b/source/quickerNES/apu/vrc7/emu2413_state.hpp
index 1993fac..2a97a60 100644
--- a/source/quickerNES/apu/vrc7/emu2413_state.hpp
+++ b/source/quickerNES/apu/vrc7/emu2413_state.hpp
@@ -2,6 +2,9 @@
 
 #include "emu2413.hpp"
 
+namespace quickerNES
+{
+	
 typedef struct
 {
   e_int32 feedback;
@@ -33,4 +36,6 @@ extern "C"
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper.cpp b/source/quickerNES/mappers/mapper.cpp
index 7353b31..a09a46d 100644
--- a/source/quickerNES/mappers/mapper.cpp
+++ b/source/quickerNES/mappers/mapper.cpp
@@ -76,6 +76,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 #include "mappers/mapper244.hpp"
 #include "mappers/mapper246.hpp"
 
+namespace quickerNES
+{
+
 Nes_Mapper::Nes_Mapper()
 {
   emu_ = NULL;
@@ -286,4 +289,6 @@ Nes_Mapper *Nes_Mapper::getMapperFromCode(const int mapperCode)
   if (mapperCode == 246) mapper = new Mapper246();
 
   return mapper;
-}
\ No newline at end of file
+}
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper.hpp b/source/quickerNES/mappers/mapper.hpp
index 4d764e2..bfbf0a3 100644
--- a/source/quickerNES/mappers/mapper.hpp
+++ b/source/quickerNES/mappers/mapper.hpp
@@ -7,6 +7,9 @@
 #include "Nes_Cpu.hpp"
 #include <climits>
 
+namespace quickerNES
+{
+
 class Blip_Buffer;
 class blip_eq_t;
 class Nes_Core;
@@ -205,3 +208,5 @@ inline void Nes_Mapper::register_state(void *p, unsigned s)
 inline bool Nes_Mapper::write_intercepted(nes_time_t, nes_addr_t, int) { return false; }
 
 inline int Nes_Mapper::read(nes_time_t, nes_addr_t) { return -1; } // signal to caller
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper000.hpp b/source/quickerNES/mappers/mapper000.hpp
index c3dfa2e..058817d 100644
--- a/source/quickerNES/mappers/mapper000.hpp
+++ b/source/quickerNES/mappers/mapper000.hpp
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 // NROM
 
+namespace quickerNES
+{
+
 class Mapper000 : public Nes_Mapper
 {
   public:
@@ -31,3 +34,5 @@ class Mapper000 : public Nes_Mapper
     // empty
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper001.hpp b/source/quickerNES/mappers/mapper001.hpp
index ad9907b..35293f1 100644
--- a/source/quickerNES/mappers/mapper001.hpp
+++ b/source/quickerNES/mappers/mapper001.hpp
@@ -16,6 +16,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // MMC1
 
 struct mmc1_state_t
@@ -122,3 +125,5 @@ class Mapper001 : public Nes_Mapper, mmc1_state_t
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper002.hpp b/source/quickerNES/mappers/mapper002.hpp
index 63ee8ba..3582867 100644
--- a/source/quickerNES/mappers/mapper002.hpp
+++ b/source/quickerNES/mappers/mapper002.hpp
@@ -17,6 +17,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // UNROM
 
 class Mapper002 : public Nes_Mapper
@@ -41,3 +44,5 @@ class Mapper002 : public Nes_Mapper
     set_prg_bank(0x8000, bank_16k, data);
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper003.hpp b/source/quickerNES/mappers/mapper003.hpp
index be23d94..91d618b 100644
--- a/source/quickerNES/mappers/mapper003.hpp
+++ b/source/quickerNES/mappers/mapper003.hpp
@@ -17,6 +17,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // CNROM
 
 class Mapper003 : public Nes_Mapper
@@ -40,3 +43,5 @@ class Mapper003 : public Nes_Mapper
     set_chr_bank(0, bank_8k, bank & 7);
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper004.hpp b/source/quickerNES/mappers/mapper004.hpp
index 36dc0bf..1475332 100644
--- a/source/quickerNES/mappers/mapper004.hpp
+++ b/source/quickerNES/mappers/mapper004.hpp
@@ -18,6 +18,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // 264 or less breaks Gargoyle's Quest II
 // 267 or less breaks Magician
 int const irq_fine_tune = 268;
@@ -251,3 +254,5 @@ class Mapper004 : public Nes_Mapper, mmc3_state_t
   nes_time_t next_time;
   int counter_just_clocked; // used only for debugging
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper005.hpp b/source/quickerNES/mappers/mapper005.hpp
index 7b9b84c..a7caa33 100644
--- a/source/quickerNES/mappers/mapper005.hpp
+++ b/source/quickerNES/mappers/mapper005.hpp
@@ -19,6 +19,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 struct mmc5_state_t
 {
   enum
@@ -145,3 +148,5 @@ class Mapper005 : public Nes_Mapper, mmc5_state_t
 
   nes_time_t irq_time;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper007.hpp b/source/quickerNES/mappers/mapper007.hpp
index f143387..ec80909 100644
--- a/source/quickerNES/mappers/mapper007.hpp
+++ b/source/quickerNES/mappers/mapper007.hpp
@@ -17,6 +17,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // AOROM
 
 class Mapper007 : public Nes_Mapper
@@ -48,3 +51,5 @@ class Mapper007 : public Nes_Mapper
       set_prg_bank(0x8000, bank_32k, bank & 7);
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper009.hpp b/source/quickerNES/mappers/mapper009.hpp
index cf8982c..72bb88f 100644
--- a/source/quickerNES/mappers/mapper009.hpp
+++ b/source/quickerNES/mappers/mapper009.hpp
@@ -3,6 +3,9 @@
 #include "mappers/mapper.hpp"
 #include <cstring>
 
+namespace quickerNES
+{
+
 // MMC2
 
 class Mapper009 : public Nes_Mapper
@@ -74,3 +77,5 @@ class Mapper009 : public Nes_Mapper
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper010.hpp b/source/quickerNES/mappers/mapper010.hpp
index 00e9f2f..f55ea85 100644
--- a/source/quickerNES/mappers/mapper010.hpp
+++ b/source/quickerNES/mappers/mapper010.hpp
@@ -2,6 +2,9 @@
 #include "mappers/mapper.hpp"
 #include <cstring>
 
+namespace quickerNES
+{
+
 // MMC4
 
 class Mapper010 : public Nes_Mapper
@@ -72,3 +75,5 @@ class Mapper010 : public Nes_Mapper
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper011.hpp b/source/quickerNES/mappers/mapper011.hpp
index 717fea0..5f1f5be 100644
--- a/source/quickerNES/mappers/mapper011.hpp
+++ b/source/quickerNES/mappers/mapper011.hpp
@@ -17,6 +17,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 // Color Dreams
 
 class Mapper011 : public Nes_Mapper
@@ -48,3 +51,5 @@ class Mapper011 : public Nes_Mapper
       set_chr_bank(0, bank_8k, bank >> 4);
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper015.hpp b/source/quickerNES/mappers/mapper015.hpp
index a81f885..14072e8 100644
--- a/source/quickerNES/mappers/mapper015.hpp
+++ b/source/quickerNES/mappers/mapper015.hpp
@@ -19,6 +19,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct Mapper015_state_t
 {
   uint8_t prg_bank[4];
@@ -90,3 +93,5 @@ class Mapper015 : public Nes_Mapper, Mapper015_state_t
 
   unsigned long int i;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper019.hpp b/source/quickerNES/mappers/mapper019.hpp
index 7fcde3a..3b9ab96 100644
--- a/source/quickerNES/mappers/mapper019.hpp
+++ b/source/quickerNES/mappers/mapper019.hpp
@@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 // to do: CHR mapping and nametable handling needs work
 
+namespace quickerNES
+{
+
 struct namco106_state_t
 {
   uint8_t regs[16];
@@ -195,3 +198,5 @@ class Mapper019 : public Nes_Mapper, namco106_state_t
   Nes_Namco_Apu sound;
   nes_time_t last_time;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper021.hpp b/source/quickerNES/mappers/mapper021.hpp
index 65bf1d4..7d768a1 100644
--- a/source/quickerNES/mappers/mapper021.hpp
+++ b/source/quickerNES/mappers/mapper021.hpp
@@ -28,6 +28,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct vrc2_state_t
 {
   uint8_t prg_banks[2];
@@ -252,3 +255,5 @@ void Mapper_VRC2_4<type_a, type_b>::write_irq(nes_time_t time,
 }
 
 typedef Mapper_VRC2_4<true, true> Mapper021;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper022.hpp b/source/quickerNES/mappers/mapper022.hpp
index e859315..6f30328 100644
--- a/source/quickerNES/mappers/mapper022.hpp
+++ b/source/quickerNES/mappers/mapper022.hpp
@@ -29,4 +29,9 @@
 #include "mappers/mapper.hpp"
 #include "mappers/mapper021.hpp"
 
-typedef Mapper_VRC2_4<false, true> Mapper022;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_VRC2_4<false, true> Mapper022;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper023.hpp b/source/quickerNES/mappers/mapper023.hpp
index be59268..d788fcd 100644
--- a/source/quickerNES/mappers/mapper023.hpp
+++ b/source/quickerNES/mappers/mapper023.hpp
@@ -28,4 +28,9 @@
 
 #include "mappers/mapper.hpp"
 
-typedef Mapper_VRC2_4<false, false> Mapper023;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_VRC2_4<false, false> Mapper023;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper024.hpp b/source/quickerNES/mappers/mapper024.hpp
index f37316c..bdccf1c 100644
--- a/source/quickerNES/mappers/mapper024.hpp
+++ b/source/quickerNES/mappers/mapper024.hpp
@@ -18,6 +18,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 struct vrc6_state_t
 {
   // written registers
@@ -228,4 +231,6 @@ class Mapper_Vrc6 : public Nes_Mapper, vrc6_state_t
   }
 };
 
-typedef Mapper_Vrc6<0> Mapper024;
\ No newline at end of file
+typedef Mapper_Vrc6<0> Mapper024;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper025.hpp b/source/quickerNES/mappers/mapper025.hpp
index 583281d..79ae1d8 100644
--- a/source/quickerNES/mappers/mapper025.hpp
+++ b/source/quickerNES/mappers/mapper025.hpp
@@ -28,4 +28,9 @@
 
 #include "mappers/mapper.hpp"
 
-typedef Mapper_VRC2_4<true, false> Mapper025;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_VRC2_4<true, false> Mapper025;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper026.hpp b/source/quickerNES/mappers/mapper026.hpp
index 065656e..5e7de08 100644
--- a/source/quickerNES/mappers/mapper026.hpp
+++ b/source/quickerNES/mappers/mapper026.hpp
@@ -6,4 +6,9 @@
 
 #include "mappers/mapper.hpp"
 
-typedef Mapper_Vrc6<3> Mapper026;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_Vrc6<3> Mapper026;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper030.hpp b/source/quickerNES/mappers/mapper030.hpp
index 8d0aa79..29f305d 100644
--- a/source/quickerNES/mappers/mapper030.hpp
+++ b/source/quickerNES/mappers/mapper030.hpp
@@ -31,6 +31,9 @@
 
 // Unrom512
 
+namespace quickerNES
+{
+
 class Mapper030 : public Nes_Mapper
 {
   public:
@@ -49,3 +52,5 @@ class Mapper030 : public Nes_Mapper
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper032.hpp b/source/quickerNES/mappers/mapper032.hpp
index e69560c..0b3f0e6 100644
--- a/source/quickerNES/mappers/mapper032.hpp
+++ b/source/quickerNES/mappers/mapper032.hpp
@@ -25,6 +25,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct mapper32_state_t
 {
   uint8_t chr_bank[8];
@@ -122,3 +125,5 @@ class Mapper032 : public Nes_Mapper, mapper32_state_t
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper033.hpp b/source/quickerNES/mappers/mapper033.hpp
index 873ba5b..907ebaa 100644
--- a/source/quickerNES/mappers/mapper033.hpp
+++ b/source/quickerNES/mappers/mapper033.hpp
@@ -25,6 +25,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct tc0190_state_t
 {
   uint8_t preg[2];
@@ -99,3 +102,5 @@ class Mapper033 : public Nes_Mapper, tc0190_state_t
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper034.hpp b/source/quickerNES/mappers/mapper034.hpp
index 1b3cd03..1224291 100644
--- a/source/quickerNES/mappers/mapper034.hpp
+++ b/source/quickerNES/mappers/mapper034.hpp
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 // Nina-1 (Deadly Towers only)
 
+namespace quickerNES
+{
+
 class Mapper034 : public Nes_Mapper
 {
   uint8_t bank;
@@ -40,3 +43,5 @@ class Mapper034 : public Nes_Mapper
     set_prg_bank(0x8000, bank_32k, bank);
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper060.hpp b/source/quickerNES/mappers/mapper060.hpp
index 5397b74..134c5ea 100644
--- a/source/quickerNES/mappers/mapper060.hpp
+++ b/source/quickerNES/mappers/mapper060.hpp
@@ -21,6 +21,9 @@
 
 // NROM-128 4-in-1 multicart
 
+namespace quickerNES
+{
+
 class Mapper060 : public Nes_Mapper
 {
   public:
@@ -49,3 +52,5 @@ class Mapper060 : public Nes_Mapper
 
   uint8_t game_sel, last_game;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper066.hpp b/source/quickerNES/mappers/mapper066.hpp
index 4ee0a1b..63fbe6e 100644
--- a/source/quickerNES/mappers/mapper066.hpp
+++ b/source/quickerNES/mappers/mapper066.hpp
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 // GNROM
 
+namespace quickerNES
+{
+
 class Mapper066 : public Nes_Mapper
 {
   uint8_t bank;
@@ -48,3 +51,5 @@ class Mapper066 : public Nes_Mapper
       set_chr_bank(0, bank_8k, bank & 3);
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper069.hpp b/source/quickerNES/mappers/mapper069.hpp
index 6402f37..5f266c0 100644
--- a/source/quickerNES/mappers/mapper069.hpp
+++ b/source/quickerNES/mappers/mapper069.hpp
@@ -19,6 +19,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 struct fme7_state_t
 {
   // first 16 bytes in register order
@@ -186,3 +189,5 @@ class Mapper069 : public Nes_Mapper, fme7_state_t
   nes_time_t last_time;
   Nes_Fme7_Apu sound;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper070.hpp b/source/quickerNES/mappers/mapper070.hpp
index 849b0fb..077d116 100644
--- a/source/quickerNES/mappers/mapper070.hpp
+++ b/source/quickerNES/mappers/mapper070.hpp
@@ -27,6 +27,9 @@
 
 // Mapper_74x161x162x32
 
+namespace quickerNES
+{
+
 template <int mapperId>
 class Mapper_74x161x162x32 : public Nes_Mapper
 {
@@ -79,4 +82,6 @@ class Mapper_74x161x162x32 : public Nes_Mapper
   uint8_t bank;
 };
 
-typedef Mapper_74x161x162x32<70> Mapper070;
\ No newline at end of file
+typedef Mapper_74x161x162x32<70> Mapper070;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper071.hpp b/source/quickerNES/mappers/mapper071.hpp
index aa2af63..0b88814 100644
--- a/source/quickerNES/mappers/mapper071.hpp
+++ b/source/quickerNES/mappers/mapper071.hpp
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 // Camerica
 
+namespace quickerNES
+{
+
 class Mapper071 : public Nes_Mapper
 {
   uint8_t regs[3];
@@ -50,3 +53,5 @@ class Mapper071 : public Nes_Mapper
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper073.hpp b/source/quickerNES/mappers/mapper073.hpp
index 9e89d32..02614ed 100644
--- a/source/quickerNES/mappers/mapper073.hpp
+++ b/source/quickerNES/mappers/mapper073.hpp
@@ -25,6 +25,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct vrc3_state_t
 {
   bool irq_enable;
@@ -131,8 +134,4 @@ class Mapper073 : public Nes_Mapper, vrc3_state_t
   }
 };
 
-// void register_vrc3_mapper();
-// void register_vrc3_mapper()
-// {
-// 	register_mapper< Mapper073> ( 73 );
-// }
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper075.hpp b/source/quickerNES/mappers/mapper075.hpp
index f227ff1..7de4929 100644
--- a/source/quickerNES/mappers/mapper075.hpp
+++ b/source/quickerNES/mappers/mapper075.hpp
@@ -19,6 +19,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct vrc1_state_t
 {
   uint8_t prg_banks[3];
@@ -106,3 +109,5 @@ class Mapper075 : public Nes_Mapper, vrc1_state_t
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper078.hpp b/source/quickerNES/mappers/mapper078.hpp
index f130682..1043b75 100644
--- a/source/quickerNES/mappers/mapper078.hpp
+++ b/source/quickerNES/mappers/mapper078.hpp
@@ -4,6 +4,9 @@
 
 // Holy Diver and Uchuusen - Cosmo Carrier.
 
+namespace quickerNES
+{
+
 class Mapper078 : public Nes_Mapper
 {
   // lower 8 bits are the reg at 8000:ffff
@@ -73,3 +76,5 @@ class Mapper078 : public Nes_Mapper
     }
   }
 };
+
+} // namespace quickNES
diff --git a/source/quickerNES/mappers/mapper079.hpp b/source/quickerNES/mappers/mapper079.hpp
index 687239f..0b92c0a 100644
--- a/source/quickerNES/mappers/mapper079.hpp
+++ b/source/quickerNES/mappers/mapper079.hpp
@@ -27,6 +27,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 template <bool multicart>
 class Mapper_AveNina : public Nes_Mapper
 {
@@ -91,3 +94,5 @@ void Mapper_AveNina<multicart>::write_regs()
 }
 
 typedef Mapper_AveNina<false> Mapper079;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper085.hpp b/source/quickerNES/mappers/mapper085.hpp
index 55af0c3..e00b701 100644
--- a/source/quickerNES/mappers/mapper085.hpp
+++ b/source/quickerNES/mappers/mapper085.hpp
@@ -17,6 +17,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 struct vrc7_state_t
 {
   // written registers
@@ -221,3 +224,5 @@ class Mapper085 : public Nes_Mapper, vrc7_state_t
     timer_period = 113 * 4 + 3
   };
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper086.hpp b/source/quickerNES/mappers/mapper086.hpp
index 6c35983..4d718e5 100644
--- a/source/quickerNES/mappers/mapper086.hpp
+++ b/source/quickerNES/mappers/mapper086.hpp
@@ -21,4 +21,9 @@
  *
  */
 
-typedef Mapper_74x161x162x32<86> Mapper086;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_74x161x162x32<86> Mapper086;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper087.hpp b/source/quickerNES/mappers/mapper087.hpp
index ef0c16c..92e62e3 100644
--- a/source/quickerNES/mappers/mapper087.hpp
+++ b/source/quickerNES/mappers/mapper087.hpp
@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 // Jaleco/Konami/Taito
 
+namespace quickerNES
+{
+
 class Mapper087 : public Nes_Mapper
 {
   uint8_t bank;
@@ -46,3 +49,5 @@ class Mapper087 : public Nes_Mapper
 
   void write(nes_time_t, nes_addr_t, int) {}
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper088.hpp b/source/quickerNES/mappers/mapper088.hpp
index 8db3e76..5ee9d64 100644
--- a/source/quickerNES/mappers/mapper088.hpp
+++ b/source/quickerNES/mappers/mapper088.hpp
@@ -27,6 +27,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct namco_34x3_state_t
 {
   uint8_t bank[8];
@@ -108,10 +111,5 @@ class Mapper_Namco_34x3 : public Nes_Mapper, namco_34x3_state_t
 
 typedef Mapper_Namco_34x3<false> Mapper088;
 
-// void register_mapper_namco_34xx();
-// void register_mapper_namco_34xx()
-// {
-// 	register_mapper< Mapper_Namco_34x3 <false> > ( 88 );
-// 	register_mapper< Mapper_Namco_34x3 <true> > ( 154 );
-// 	register_mapper< Mapper_Namco_34xx > ( 206 );
-// }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper089.hpp b/source/quickerNES/mappers/mapper089.hpp
index 3ddf413..8a4cad2 100644
--- a/source/quickerNES/mappers/mapper089.hpp
+++ b/source/quickerNES/mappers/mapper089.hpp
@@ -26,6 +26,9 @@
 
 // Sunsoft2b
 
+namespace quickerNES
+{
+
 class Mapper089 : public Nes_Mapper
 {
   public:
@@ -55,3 +58,5 @@ class Mapper089 : public Nes_Mapper
 
   uint8_t regs;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper093.hpp b/source/quickerNES/mappers/mapper093.hpp
index bee8a90..94fd81e 100644
--- a/source/quickerNES/mappers/mapper093.hpp
+++ b/source/quickerNES/mappers/mapper093.hpp
@@ -26,6 +26,9 @@
 
 // Sunsoft2a
 
+namespace quickerNES
+{
+
 class Mapper093 : public Nes_Mapper
 {
   public:
@@ -54,3 +57,5 @@ class Mapper093 : public Nes_Mapper
 
   uint8_t regs;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper094.hpp b/source/quickerNES/mappers/mapper094.hpp
index 9e54456..04318a0 100644
--- a/source/quickerNES/mappers/mapper094.hpp
+++ b/source/quickerNES/mappers/mapper094.hpp
@@ -28,6 +28,9 @@
 
 // Un1rom
 
+namespace quickerNES
+{
+
 class Mapper094 : public Nes_Mapper
 {
   public:
@@ -53,3 +56,5 @@ class Mapper094 : public Nes_Mapper
 
   uint8_t bank;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper097.hpp b/source/quickerNES/mappers/mapper097.hpp
index c4f89ce..2e1a260 100644
--- a/source/quickerNES/mappers/mapper097.hpp
+++ b/source/quickerNES/mappers/mapper097.hpp
@@ -27,6 +27,9 @@
 
 // Irem_Tam_S1
 
+namespace quickerNES
+{
+
 class Mapper097 : public Nes_Mapper
 {
   public:
@@ -62,3 +65,5 @@ class Mapper097 : public Nes_Mapper
 
   uint8_t bank;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper113.hpp b/source/quickerNES/mappers/mapper113.hpp
index d43252c..d60b138 100644
--- a/source/quickerNES/mappers/mapper113.hpp
+++ b/source/quickerNES/mappers/mapper113.hpp
@@ -25,4 +25,9 @@
  * Nina-03 / Nina-06
  */
 
-typedef Mapper_AveNina<true> Mapper113;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_AveNina<true> Mapper113;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper140.hpp b/source/quickerNES/mappers/mapper140.hpp
index 5970353..59f56ad 100644
--- a/source/quickerNES/mappers/mapper140.hpp
+++ b/source/quickerNES/mappers/mapper140.hpp
@@ -28,6 +28,9 @@
 
 // Jaleco_JF11
 
+namespace quickerNES
+{
+
 class Mapper140 : public Nes_Mapper
 {
   public:
@@ -62,3 +65,5 @@ class Mapper140 : public Nes_Mapper
 
   uint8_t regs;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper152.hpp b/source/quickerNES/mappers/mapper152.hpp
index 9cf4bcc..6b5071f 100644
--- a/source/quickerNES/mappers/mapper152.hpp
+++ b/source/quickerNES/mappers/mapper152.hpp
@@ -21,4 +21,9 @@
  *
  */
 
-typedef Mapper_74x161x162x32<152> Mapper152;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_74x161x162x32<152> Mapper152;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper154.hpp b/source/quickerNES/mappers/mapper154.hpp
index df363f6..d8e74c6 100644
--- a/source/quickerNES/mappers/mapper154.hpp
+++ b/source/quickerNES/mappers/mapper154.hpp
@@ -25,4 +25,9 @@
  * Mapper 206
  */
 
-typedef Mapper_Namco_34x3<true> Mapper154;
\ No newline at end of file
+namespace quickerNES
+{
+
+typedef Mapper_Namco_34x3<true> Mapper154;
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper156.hpp b/source/quickerNES/mappers/mapper156.hpp
index b0ba7bd..162c5fc 100644
--- a/source/quickerNES/mappers/mapper156.hpp
+++ b/source/quickerNES/mappers/mapper156.hpp
@@ -4,6 +4,9 @@
 
 // DIS23C01 DAOU ROM CONTROLLER
 
+namespace quickerNES
+{
+
 struct m156_state_t
 {
   uint8_t prg_bank;
@@ -58,3 +61,5 @@ class Mapper156 : public Nes_Mapper, m156_state_t
     }
   }
 };
+
+} // namespace quickNES
diff --git a/source/quickerNES/mappers/mapper180.hpp b/source/quickerNES/mappers/mapper180.hpp
index 800067c..2e40eb4 100644
--- a/source/quickerNES/mappers/mapper180.hpp
+++ b/source/quickerNES/mappers/mapper180.hpp
@@ -27,6 +27,9 @@
 
 // UxROM (inverted)
 
+namespace quickerNES
+{
+
 class Mapper180 : public Nes_Mapper
 {
   public:
@@ -53,3 +56,5 @@ class Mapper180 : public Nes_Mapper
 
   uint8_t bank;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper184.hpp b/source/quickerNES/mappers/mapper184.hpp
index 78ca3d7..2c3038b 100644
--- a/source/quickerNES/mappers/mapper184.hpp
+++ b/source/quickerNES/mappers/mapper184.hpp
@@ -26,6 +26,9 @@
 
 // Sunsoft1
 
+namespace quickerNES
+{
+
 class Mapper184 : public Nes_Mapper
 {
   public:
@@ -63,3 +66,5 @@ class Mapper184 : public Nes_Mapper
 
   uint8_t regs;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper190.hpp b/source/quickerNES/mappers/mapper190.hpp
index 1d46aa9..a9dd930 100644
--- a/source/quickerNES/mappers/mapper190.hpp
+++ b/source/quickerNES/mappers/mapper190.hpp
@@ -4,6 +4,9 @@
 
 // Magic Kid Googoo
 
+namespace quickerNES
+{
+
 class Mapper190 : public Nes_Mapper
 {
   public:
@@ -53,3 +56,5 @@ class Mapper190 : public Nes_Mapper
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper193.hpp b/source/quickerNES/mappers/mapper193.hpp
index 0e4f15c..016f686 100644
--- a/source/quickerNES/mappers/mapper193.hpp
+++ b/source/quickerNES/mappers/mapper193.hpp
@@ -29,6 +29,9 @@
 
 // NTDEC's TC-112 mapper IC.
 
+namespace quickerNES
+{
+
 class Mapper193 : public Nes_Mapper
 {
   public:
@@ -74,3 +77,5 @@ class Mapper193 : public Nes_Mapper
 
   uint8_t regs[4];
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper206.hpp b/source/quickerNES/mappers/mapper206.hpp
index ec95910..2800443 100644
--- a/source/quickerNES/mappers/mapper206.hpp
+++ b/source/quickerNES/mappers/mapper206.hpp
@@ -27,6 +27,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct namco_34xx_state_t
 {
   uint8_t bank[8];
@@ -96,3 +99,5 @@ class Mapper206 : public Nes_Mapper, namco_34xx_state_t
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper207.hpp b/source/quickerNES/mappers/mapper207.hpp
index 997e8ab..e4cc79b 100644
--- a/source/quickerNES/mappers/mapper207.hpp
+++ b/source/quickerNES/mappers/mapper207.hpp
@@ -25,6 +25,9 @@
 
 #include "mappers/mapper.hpp"
 
+namespace quickerNES
+{
+
 struct taito_x1005_state_t
 {
   uint8_t preg[3];
@@ -89,3 +92,5 @@ class Mapper207 : public Nes_Mapper, taito_x1005_state_t
 
   virtual void write(nes_time_t, nes_addr_t addr, int data) {}
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper232.hpp b/source/quickerNES/mappers/mapper232.hpp
index 080feb4..91d1291 100644
--- a/source/quickerNES/mappers/mapper232.hpp
+++ b/source/quickerNES/mappers/mapper232.hpp
@@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
 // Quattro
 
+namespace quickerNES
+{
+
 class Mapper232 : public Nes_Mapper
 {
   uint8_t regs[2];
@@ -52,3 +55,5 @@ class Mapper232 : public Nes_Mapper
     Mapper232::apply_mapping();
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper240.hpp b/source/quickerNES/mappers/mapper240.hpp
index 133a8b9..a03b2dc 100644
--- a/source/quickerNES/mappers/mapper240.hpp
+++ b/source/quickerNES/mappers/mapper240.hpp
@@ -25,6 +25,9 @@
 
 // https://www.nesdev.org/wiki/INES_Mapper240
 
+namespace quickerNES
+{
+
 class Mapper240 : public Nes_Mapper
 {
   public:
@@ -62,3 +65,5 @@ class Mapper240 : public Nes_Mapper
 
   uint8_t regs;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper241.hpp b/source/quickerNES/mappers/mapper241.hpp
index 06c3c58..957aab4 100644
--- a/source/quickerNES/mappers/mapper241.hpp
+++ b/source/quickerNES/mappers/mapper241.hpp
@@ -25,6 +25,9 @@
 
 // https://www.nesdev.org/wiki/INES_Mapper241
 
+namespace quickerNES
+{
+
 class Mapper241 : public Nes_Mapper
 {
   public:
@@ -51,3 +54,5 @@ class Mapper241 : public Nes_Mapper
 
   uint8_t bank;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper244.hpp b/source/quickerNES/mappers/mapper244.hpp
index ea9639d..67b4529 100644
--- a/source/quickerNES/mappers/mapper244.hpp
+++ b/source/quickerNES/mappers/mapper244.hpp
@@ -27,6 +27,9 @@
 
 // https://www.nesdev.org/wiki/INES_Mapper244
 
+namespace quickerNES
+{
+
 struct mapper244_state_t
 {
   uint8_t preg;
@@ -68,3 +71,5 @@ class Mapper244 : public Nes_Mapper, mapper244_state_t
     }
   }
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/mappers/mapper246.hpp b/source/quickerNES/mappers/mapper246.hpp
index de930ca..38e2391 100644
--- a/source/quickerNES/mappers/mapper246.hpp
+++ b/source/quickerNES/mappers/mapper246.hpp
@@ -27,6 +27,9 @@
 
 // https://www.nesdev.org/wiki/INES_Mapper246
 
+namespace quickerNES
+{
+
 class Mapper246 : public Nes_Mapper
 {
   public:
@@ -73,3 +76,5 @@ class Mapper246 : public Nes_Mapper
 
   uint8_t regs[8];
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/ppu/Nes_Ppu.cpp b/source/quickerNES/ppu/Nes_Ppu.cpp
index 6628b36..905cc62 100644
--- a/source/quickerNES/ppu/Nes_Ppu.cpp
+++ b/source/quickerNES/ppu/Nes_Ppu.cpp
@@ -3,9 +3,12 @@
 
 // Nes_Emu 0.7.0. http://www.slack.net/~ant/
 
+#include <cstring>
 #include "Nes_Ppu.hpp"
 #include "Nes_Core.hpp"
-#include <cstring>
+
+namespace quickerNES
+{
 
 /* Copyright (C) 2004-2006 Shay Green. This module is free software; you
 can redistribute it and/or modify it under the terms of the GNU Lesser
@@ -652,3 +655,5 @@ nes_time_t Nes_Ppu::earliest_open_bus_decay()
 {
   return (decay_low < decay_high) ? decay_low : decay_high;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/ppu/Nes_Ppu.hpp b/source/quickerNES/ppu/Nes_Ppu.hpp
index deaedfc..7340e38 100644
--- a/source/quickerNES/ppu/Nes_Ppu.hpp
+++ b/source/quickerNES/ppu/Nes_Ppu.hpp
@@ -3,8 +3,11 @@
 // NES PPU emulator
 // Nes_Emu 0.7.0
 
-#include "Nes_Ppu_Rendering.hpp"
 #include <climits>
+#include "Nes_Ppu_Rendering.hpp"
+
+namespace quickerNES
+{
 
 class Nes_Mapper;
 class Nes_Core;
@@ -139,3 +142,5 @@ inline void Nes_Ppu::update_open_bus(nes_time_t time)
   if (time >= decay_low) open_bus &= ~0x1F;
   if (time >= decay_high) open_bus &= ~0xE0;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/ppu/Nes_Ppu_Impl.cpp b/source/quickerNES/ppu/Nes_Ppu_Impl.cpp
index 9eb2236..35e6f51 100644
--- a/source/quickerNES/ppu/Nes_Ppu_Impl.cpp
+++ b/source/quickerNES/ppu/Nes_Ppu_Impl.cpp
@@ -16,6 +16,9 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
+namespace quickerNES
+{
+
 int const cache_line_size = 128; // tile cache is kept aligned to this boundary
 
 inline void set_be32(void *p, unsigned long n)
@@ -429,3 +432,5 @@ long Nes_Ppu_Impl::recalc_sprite_max(int scanline)
 
   return 0;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/ppu/Nes_Ppu_Impl.hpp b/source/quickerNES/ppu/Nes_Ppu_Impl.hpp
index a62635b..83d8a43 100644
--- a/source/quickerNES/ppu/Nes_Ppu_Impl.hpp
+++ b/source/quickerNES/ppu/Nes_Ppu_Impl.hpp
@@ -5,6 +5,9 @@
 
 #include <cstdint>
 
+namespace quickerNES
+{
+
 struct ppu_state_t
 {
   uint8_t w2000;        // control
@@ -239,3 +242,5 @@ inline void Nes_Ppu_Impl::begin_frame()
   palette_offset = palette_begin * 0x01010101;
   addr_inc = w2000 & 4 ? 32 : 1;
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp b/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp
index a2f4267..495e800 100644
--- a/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp
+++ b/source/quickerNES/ppu/Nes_Ppu_Rendering.cpp
@@ -16,7 +16,8 @@ more details. You should have received a copy of the GNU Lesser General
 Public License along with this module; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
 
-// Nes_Ppu_Impl
+namespace quickerNES
+{
 
 static unsigned zero = 0; // helps CodeWarrior optimizer when added to constants
 
@@ -501,3 +502,5 @@ void Nes_Ppu_Rendering::draw_background(int start, int count)
     }
   }
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/ppu/Nes_Ppu_Rendering.hpp b/source/quickerNES/ppu/Nes_Ppu_Rendering.hpp
index 39def0f..8372119 100644
--- a/source/quickerNES/ppu/Nes_Ppu_Rendering.hpp
+++ b/source/quickerNES/ppu/Nes_Ppu_Rendering.hpp
@@ -5,6 +5,9 @@
 
 #include "Nes_Ppu_Impl.hpp"
 
+namespace quickerNES
+{
+
 class Nes_Ppu_Rendering : public Nes_Ppu_Impl
 {
   typedef Nes_Ppu_Impl base;
@@ -57,3 +60,5 @@ inline void Nes_Ppu_Rendering::draw_sprites(int start, int count)
 {
   draw_scanlines(start, count, host_pixels + host_row_bytes * start, host_row_bytes, 2);
 }
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/quickerNES/quickerNESInstance.hpp b/source/quickerNES/quickerNESInstance.hpp
index f7d63f6..09e505e 100644
--- a/source/quickerNES/quickerNESInstance.hpp
+++ b/source/quickerNES/quickerNESInstance.hpp
@@ -3,6 +3,9 @@
 #include <Nes_Emu.hpp>
 #include <emuInstance.hpp>
 
+namespace quickerNES
+{
+
 class QuickerNESInstance : public EmuInstance
 {
   public:
@@ -72,3 +75,5 @@ class QuickerNESInstance : public EmuInstance
   // Emulator instance
   Nes_Emu *_nes;
 };
+
+} // namespace quickNES
\ No newline at end of file
diff --git a/source/tester.cpp b/source/tester.cpp
index f9222ad..b0c31dc 100644
--- a/source/tester.cpp
+++ b/source/tester.cpp
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef _USE_QUICKERNES
-  auto e = QuickerNESInstance();
+  auto e = quickerNES::QuickerNESInstance();
 #endif
 
   // Loading ROM File