diff --git a/gr-jay/gr-jay/nbproject/configurations.xml b/gr-jay/gr-jay/nbproject/configurations.xml
index 8c3bae9..4b9d69c 100644
--- a/gr-jay/gr-jay/nbproject/configurations.xml
+++ b/gr-jay/gr-jay/nbproject/configurations.xml
@@ -3,8 +3,19 @@
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="../grc" name="0">
     </df>
+    <logicalFolder name="include" displayName="include" projectFiles="true">
+      <logicalFolder name="jay" displayName="jay" projectFiles="true">
+        <itemPath>../include/jay/CMakeLists.txt</itemPath>
+        <itemPath>../include/jay/api.h</itemPath>
+        <itemPath>../include/jay/bit_slicer.h</itemPath>
+        <itemPath>../include/jay/pocsag_decoder.h</itemPath>
+        <itemPath>../include/jay/square2_ff.h</itemPath>
+        <itemPath>../include/jay/square_ff.h</itemPath>
+      </logicalFolder>
+    </logicalFolder>
     <df root="../lib" name="1">
-      <in>garage_impl.cc</in>
+      <in>PocsagDecoder.cpp</in>
+      <in>pocsag_decoder_impl.cc</in>
       <in>qa_jay.cc</in>
       <in>square2_ff_impl.cc</in>
       <in>square_ff_impl.cc</in>
@@ -30,6 +41,7 @@
   <sourceRootList>
     <Elem>../lib</Elem>
     <Elem>../grc</Elem>
+    <Elem>../include</Elem>
   </sourceRootList>
   <projectmakefile></projectmakefile>
   <confs>
@@ -70,22 +82,41 @@
       <item path="../build/swig/_jay_swig_doc_tag.cpp"
             ex="false"
             tool="1"
-            flavor2="0">
+            flavor2="11">
         <ccTool flags="0">
+          <incDir>
+            <pElem>../swig</pElem>
+            <pElem>/usr/include/gnuradio/swig</pElem>
+            <pElem>/usr/include/python2.7</pElem>
+          </incDir>
         </ccTool>
       </item>
       <item path="../build/swig/_jay_swig_swig_tag.cpp"
             ex="false"
             tool="1"
-            flavor2="0">
+            flavor2="11">
         <ccTool flags="0">
+          <incDir>
+            <pElem>../build/include</pElem>
+            <pElem>../build/swig</pElem>
+            <pElem>../swig</pElem>
+            <pElem>/usr/include/gnuradio/swig</pElem>
+            <pElem>/usr/include/python2.7</pElem>
+          </incDir>
         </ccTool>
       </item>
       <item path="../build/swig/jay_swigPYTHON_wrap.cxx"
             ex="false"
             tool="1"
-            flavor2="0">
+            flavor2="11">
         <ccTool flags="1">
+          <incDir>
+            <pElem>../build/include</pElem>
+            <pElem>../build/swig</pElem>
+            <pElem>../swig</pElem>
+            <pElem>/usr/include/gnuradio/swig</pElem>
+            <pElem>/usr/include/python2.7</pElem>
+          </incDir>
           <preprocessorList>
             <Elem>_jay_swig_EXPORTS</Elem>
           </preprocessorList>
@@ -96,45 +127,69 @@
             tool="1"
             flavor2="0">
         <ccTool flags="0">
-        </ccTool>
-      </item>
-      <item path="../lib/garage_impl.cc" ex="false" tool="1" flavor2="0">
-        <ccTool flags="1">
-          <preprocessorList>
-            <Elem>gnuradio_jay_EXPORTS</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../lib/qa_jay.cc" ex="false" tool="1" flavor2="0">
-        <ccTool flags="0">
-        </ccTool>
-      </item>
-      <item path="../lib/square2_ff_impl.cc" ex="false" tool="1" flavor2="0">
-        <ccTool flags="1">
-          <preprocessorList>
-            <Elem>gnuradio_jay_EXPORTS</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../lib/square_ff_impl.cc" ex="false" tool="1" flavor2="0">
-        <ccTool flags="1">
-          <preprocessorList>
-            <Elem>gnuradio_jay_EXPORTS</Elem>
-          </preprocessorList>
-        </ccTool>
-      </item>
-      <item path="../lib/test_jay.cc" ex="false" tool="1" flavor2="0">
-        <ccTool flags="0">
-        </ccTool>
-      </item>
-      <folder path="swig">
-        <ccTool>
           <incDir>
+            <pElem>../build/include</pElem>
+            <pElem>../build/swig</pElem>
             <pElem>../swig</pElem>
             <pElem>/usr/include/gnuradio/swig</pElem>
             <pElem>/usr/include/python2.7</pElem>
           </incDir>
         </ccTool>
+      </item>
+      <item path="../include/jay/CMakeLists.txt" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="../include/jay/api.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="../include/jay/bit_slicer.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="../include/jay/pocsag_decoder.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="../include/jay/square2_ff.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="../include/jay/square_ff.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="../lib/PocsagDecoder.cpp" ex="false" tool="1" flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>gnuradio_jay_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../lib/pocsag_decoder_impl.cc" ex="false" tool="1" flavor2="0">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>gnuradio_jay_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../lib/qa_jay.cc" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+        </ccTool>
+      </item>
+      <item path="../lib/square2_ff_impl.cc" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>gnuradio_jay_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../lib/square_ff_impl.cc" ex="false" tool="1" flavor2="11">
+        <ccTool flags="1">
+          <preprocessorList>
+            <Elem>gnuradio_jay_EXPORTS</Elem>
+          </preprocessorList>
+        </ccTool>
+      </item>
+      <item path="../lib/test_jay.cc" ex="false" tool="1" flavor2="11">
+        <ccTool flags="0">
+        </ccTool>
+      </item>
+      <folder path="1">
+        <ccTool>
+          <incDir>
+            <pElem>../build/include</pElem>
+          </incDir>
+        </ccTool>
       </folder>
     </conf>
   </confs>
diff --git a/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties b/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties
index 6f39e33..ee78f66 100644
--- a/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties
+++ b/gr-jay/gr-jay/nbproject/private/CodeAssistancePathMapper.properties
@@ -1,3 +1,2 @@
-# Automatic path mapper. CRC = 1429676618
-/home/jens/gr-jay/build/lib=/home/jens/gr-jay/build/lib
-/home/jens/gr-jay/build=/home/jens/gr-jay
+# Automatic path mapper. CRC = 266605595
+/usr/include/gnuradio/swig=/usr/include/gnuradio/swig
diff --git a/gr-jay/gr-jay/nbproject/private/Default.properties b/gr-jay/gr-jay/nbproject/private/Default.properties
index c3eeb24..beb0b34 100644
--- a/gr-jay/gr-jay/nbproject/private/Default.properties
+++ b/gr-jay/gr-jay/nbproject/private/Default.properties
@@ -1,9 +1,7 @@
-/home/jens/gr-jay/lib/square2_ff_impl.cc=/home/jens/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/square2_ff_impl.cc.o -c /home/jens/gr-jay/lib/square2_ff_impl.cc
-/home/jens/gr-jay/lib/test_jay.cc=/home/jens/gr-jay/build/lib#-I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/test-jay.dir/test_jay.cc.o -c /home/jens/gr-jay/lib/test_jay.cc
-/home/jens/gr-jay/lib/qa_jay.cc=/home/jens/gr-jay/build/lib#-I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/test-jay.dir/qa_jay.cc.o -c /home/jens/gr-jay/lib/qa_jay.cc
-/home/jens/gr-jay/lib/square_ff_impl.cc=/home/jens/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/square_ff_impl.cc.o -c /home/jens/gr-jay/lib/square_ff_impl.cc
-/home/jens/gr-jay/lib/garage_impl.cc=/home/jens/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/garage_impl.cc.o -c /home/jens/gr-jay/lib/garage_impl.cc
-/home/jens/gr-jay/build/swig/_jay_swig_doc_tag.cpp=/home/jens/gr-jay/build/swig#-I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -I/home/jens/gr-jay/build/swig -I/home/jens/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/_jay_swig_doc_tag.dir/_jay_swig_doc_tag.cpp.o -c /home/jens/gr-jay/build/swig/_jay_swig_doc_tag.cpp
-/home/jens/gr-jay/build/swig/jay_swigPYTHON_wrap.cxx=/home/jens/gr-jay/build/swig#-D_jay_swig_EXPORTS -I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -I/home/jens/gr-jay/build/swig -I/home/jens/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fPIC -fvisibility=hidden -Wno-unused-but-set-variable -o CMakeFiles/_jay_swig.dir/jay_swigPYTHON_wrap.cxx.o -c /home/jens/gr-jay/build/swig/jay_swigPYTHON_wrap.cxx
-/home/jens/gr-jay/build/swig/_jay_swig_swig_tag.cpp=/home/jens/gr-jay/build/swig#-I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -I/home/jens/gr-jay/build/swig -I/home/jens/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/_jay_swig_swig_tag.dir/_jay_swig_swig_tag.cpp.o -c /home/jens/gr-jay/build/swig/_jay_swig_swig_tag.cpp
-/home/jens/gr-jay/build/swig/jay_swig_swig_2d0df.cpp=/home/jens/gr-jay/build/swig#-I/home/jens/gr-jay/lib -I/home/jens/gr-jay/include -I/home/jens/gr-jay/build/lib -I/home/jens/gr-jay/build/include -I/home/jens/gr-jay/build/swig -I/home/jens/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/jay_swig_swig_2d0df.dir/jay_swig_swig_2d0df.cpp.o -c /home/jens/gr-jay/build/swig/jay_swig_swig_2d0df.cpp
+/home/jens/work/software/projects/GnuRadio/gr-jay/lib/square_ff_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/square_ff_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/square_ff_impl.cc
+/home/jens/work/software/projects/GnuRadio/gr-jay/lib/PocsagDecoder.cpp=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/PocsagDecoder.cpp.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/PocsagDecoder.cpp
+/home/jens/work/software/projects/GnuRadio/gr-jay/lib/square2_ff_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/square2_ff_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/square2_ff_impl.cc
+/home/jens/work/software/projects/GnuRadio/gr-jay/lib/garage_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/garage_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/garage_impl.cc
+/home/jens/work/software/projects/GnuRadio/gr-jay/lib/pocsag_decoder_impl.cc=/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib#-Dgnuradio_jay_EXPORTS -I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -O3 -DNDEBUG -fPIC -fvisibility=hidden -o CMakeFiles/gnuradio-jay.dir/pocsag_decoder_impl.cc.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/lib/pocsag_decoder_impl.cc
+/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/jay_swig_swig_2d0df.cpp=/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig#-I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig -I/home/jens/work/software/projects/GnuRadio/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/jay_swig_swig_2d0df.dir/jay_swig_swig_2d0df.cpp.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/jay_swig_swig_2d0df.cpp
+/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/_jay_swig_swig_tag.cpp=/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig#-I/home/jens/work/software/projects/GnuRadio/gr-jay/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/lib -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/include -I/home/jens/work/software/projects/GnuRadio/gr-jay/build/swig -I/home/jens/work/software/projects/GnuRadio/gr-jay/swig -I/usr/include/gnuradio/swig -I/usr/include/python2.7 -O3 -DNDEBUG -fvisibility=hidden -o CMakeFiles/_jay_swig_swig_tag.dir/_jay_swig_swig_tag.cpp.o -c /home/jens/work/software/projects/GnuRadio/gr-jay/build/swig/_jay_swig_swig_tag.cpp
diff --git a/gr-jay/gr-jay/nbproject/private/configurations.xml b/gr-jay/gr-jay/nbproject/private/configurations.xml
index 1483723..b5bd6d4 100644
--- a/gr-jay/gr-jay/nbproject/private/configurations.xml
+++ b/gr-jay/gr-jay/nbproject/private/configurations.xml
@@ -4,8 +4,12 @@
     <df root="../grc" name="0">
     </df>
     <df root="../lib" name="1">
-      <in>garage_impl.cc</in>
-      <in>garage_impl.h</in>
+      <in>PocsagDecoder.cpp</in>
+      <in>PocsagDecoder.hpp</in>
+      <in>bit_slicer_impl.cc</in>
+      <in>bit_slicer_impl.h</in>
+      <in>pocsag_decoder_impl.cc</in>
+      <in>pocsag_decoder_impl.h</in>
       <in>qa_jay.cc</in>
       <in>qa_jay.h</in>
       <in>square2_ff_impl.cc</in>
diff --git a/gr-jay/gr-jay/nbproject/private/private.xml b/gr-jay/gr-jay/nbproject/private/private.xml
index 11826b8..3b21b95 100644
--- a/gr-jay/gr-jay/nbproject/private/private.xml
+++ b/gr-jay/gr-jay/nbproject/private/private.xml
@@ -9,9 +9,6 @@
     </data>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/home/jens/gr-jay/lib/garage_impl.cc</file>
-            <file>file:/home/jens/gr-jay/lib/garage_impl.h</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>
diff --git a/gr-jay/gr-jay/nbproject/project.xml b/gr-jay/gr-jay/nbproject/project.xml
index ae07452..6d023af 100644
--- a/gr-jay/gr-jay/nbproject/project.xml
+++ b/gr-jay/gr-jay/nbproject/project.xml
@@ -6,12 +6,13 @@
             <name>gr-jay</name>
             <c-extensions/>
             <cpp-extensions>cc,cpp,cxx</cpp-extensions>
-            <header-extensions>h</header-extensions>
+            <header-extensions>h,hpp</header-extensions>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects/>
             <sourceRootList>
                 <sourceRootElem>../lib</sourceRootElem>
                 <sourceRootElem>../grc</sourceRootElem>
+                <sourceRootElem>../include</sourceRootElem>
             </sourceRootList>
             <confList>
                 <confElem>