Rework example directories. Gets rid of gnuradio-examples, moves these to more appropriate components.

gnuradio-core and grc now have their own examples directories for files directly related to them.

61 files changed, 638 insertions, 495 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8430164c1..347318de8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,6 @@ add_subdirectory(gr-video-sdl)
 add_subdirectory(gr-vocoder)
 add_subdirectory(gr-fcd)
 add_subdirectory(gr-wxgui)
-add_subdirectory(gnuradio-examples)
 
 #finalize cpack after subdirs processed
 include(GrPackage)
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
index 101f4c3a3..c05c6404f 100644
--- a/gnuradio-core/CMakeLists.txt
+++ b/gnuradio-core/CMakeLists.txt
@@ -126,6 +126,7 @@ endif(ENABLE_TESTING)
 if(ENABLE_PYTHON)
     add_subdirectory(src/lib/swig)
     add_subdirectory(src/python/gnuradio)
+    add_subdirectory(src/examples)
 endif(ENABLE_PYTHON)
 
 ########################################################################
diff --git a/gnuradio-examples/python/CMakeLists.txt b/gnuradio-core/src/examples/CMakeLists.txt
index 39b1fe806..4bdc463e4 100644
--- a/gnuradio-examples/python/CMakeLists.txt
+++ b/gnuradio-core/src/examples/CMakeLists.txt
@@ -20,4 +20,5 @@
 add_subdirectory(mp-sched)
 add_subdirectory(network)
 add_subdirectory(pfb)
-add_subdirectory(tags)
\ No newline at end of file
+add_subdirectory(tags)
+add_subdirectory(volk_benchmark)
\ No newline at end of file
diff --git a/gnuradio-examples/python/mp-sched/CMakeLists.txt b/gnuradio-core/src/examples/mp-sched/CMakeLists.txt
index 5accd8c4a..2bf70d464 100644
--- a/gnuradio-examples/python/mp-sched/CMakeLists.txt
+++ b/gnuradio-core/src/examples/mp-sched/CMakeLists.txt
@@ -25,11 +25,11 @@ GR_PYTHON_INSTALL(PROGRAMS
   synthetic.py
   wfm_rcv_pll_to_wav.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
-  COMPONENT "gnuradio_examples"
+  COMPONENT "core_python"
 )
 
 install(
     FILES README
     DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
-    COMPONENT "gnuadio_examples"
+    COMPONENT "core_python"
 )
diff --git a/gnuradio-examples/python/mp-sched/README b/gnuradio-core/src/examples/mp-sched/README
index ae575437a..ae575437a 100644
--- a/gnuradio-examples/python/mp-sched/README
+++ b/gnuradio-core/src/examples/mp-sched/README
diff --git a/gnuradio-examples/python/mp-sched/perf-data/core-duo.dat b/gnuradio-core/src/examples/mp-sched/perf-data/core-duo.dat
index 064d1e128..064d1e128 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/core-duo.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/core-duo.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/core2-duo.dat b/gnuradio-core/src/examples/mp-sched/perf-data/core2-duo.dat
index d67dee8e5..d67dee8e5 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/core2-duo.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/core2-duo.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat b/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat
index fa182c69a..fa182c69a 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-2.33-clovertown.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat b/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat
index 57d49ed33..57d49ed33 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/dual-quad-core-3.00-penryn.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/js21-altivec.dat b/gnuradio-core/src/examples/mp-sched/perf-data/js21-altivec.dat
index d0b8148f0..d0b8148f0 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/js21-altivec.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/js21-altivec.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/js21.dat b/gnuradio-core/src/examples/mp-sched/perf-data/js21.dat
index a23bcebe7..a23bcebe7 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/js21.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/js21.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/ps3-altivec.dat b/gnuradio-core/src/examples/mp-sched/perf-data/ps3-altivec.dat
index dd01b31bd..dd01b31bd 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/ps3-altivec.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/ps3-altivec.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/ps3.dat b/gnuradio-core/src/examples/mp-sched/perf-data/ps3.dat
index c9bac37cc..c9bac37cc 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/ps3.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/ps3.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/qs21-altivec.dat b/gnuradio-core/src/examples/mp-sched/perf-data/qs21-altivec.dat
index 8364be363..8364be363 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/qs21-altivec.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/qs21-altivec.dat
diff --git a/gnuradio-examples/python/mp-sched/perf-data/qs21.dat b/gnuradio-core/src/examples/mp-sched/perf-data/qs21.dat
index cc628740a..cc628740a 100644
--- a/gnuradio-examples/python/mp-sched/perf-data/qs21.dat
+++ b/gnuradio-core/src/examples/mp-sched/perf-data/qs21.dat
diff --git a/gnuradio-examples/python/mp-sched/plot_flops.py b/gnuradio-core/src/examples/mp-sched/plot_flops.py
index b3f819397..b3f819397 100755
--- a/gnuradio-examples/python/mp-sched/plot_flops.py
+++ b/gnuradio-core/src/examples/mp-sched/plot_flops.py
diff --git a/gnuradio-examples/python/mp-sched/run_synthetic.py b/gnuradio-core/src/examples/mp-sched/run_synthetic.py
index 565e6c5c7..565e6c5c7 100755
--- a/gnuradio-examples/python/mp-sched/run_synthetic.py
+++ b/gnuradio-core/src/examples/mp-sched/run_synthetic.py
diff --git a/gnuradio-examples/python/mp-sched/synthetic.py b/gnuradio-core/src/examples/mp-sched/synthetic.py
index e1fcb20bd..e1fcb20bd 100755
--- a/gnuradio-examples/python/mp-sched/synthetic.py
+++ b/gnuradio-core/src/examples/mp-sched/synthetic.py
diff --git a/gnuradio-examples/python/mp-sched/wfm_rcv_pll_to_wav.py b/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py
index 3971d8b73..3971d8b73 100755
--- a/gnuradio-examples/python/mp-sched/wfm_rcv_pll_to_wav.py
+++ b/gnuradio-core/src/examples/mp-sched/wfm_rcv_pll_to_wav.py
diff --git a/gnuradio-examples/python/network/CMakeLists.txt b/gnuradio-core/src/examples/network/CMakeLists.txt
index e70403ba0..33e7cb7d0 100644
--- a/gnuradio-examples/python/network/CMakeLists.txt
+++ b/gnuradio-core/src/examples/network/CMakeLists.txt
@@ -25,6 +25,6 @@ GR_PYTHON_INSTALL(PROGRAMS
   vector_sink.py
   vector_source.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/network
-  COMPONENT "gnuradio_examples"
+  COMPONENT "core_python"
 )
 
diff --git a/gnuradio-examples/python/network/audio_sink.py b/gnuradio-core/src/examples/network/audio_sink.py
index eb18a75aa..48b643578 100755
--- a/gnuradio-examples/python/network/audio_sink.py
+++ b/gnuradio-core/src/examples/network/audio_sink.py
@@ -20,9 +20,16 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, audio
+from gnuradio import gr
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
+import sys
+
+try:
+    from gnuradio import audio
+except ImportError:
+    sys.stderr.write("Failed to import gnuradio.audio. Make sure gr-audio component is installed.\n")
+    sys.exit(1)
 
 class audio_sink(gr.top_block):
     def __init__(self, host, port, pkt_size, sample_rate, eof, wait):
diff --git a/gnuradio-examples/python/network/audio_source.py b/gnuradio-core/src/examples/network/audio_source.py
index 5818ccbd8..ef0dc13ba 100755
--- a/gnuradio-examples/python/network/audio_source.py
+++ b/gnuradio-core/src/examples/network/audio_source.py
@@ -20,9 +20,16 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, audio
+from gnuradio import gr
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
+import sys
+
+try:
+    from gnuradio import audio
+except ImportError:
+    sys.stderr.write("Failed to import gnuradio.audio. Make sure gr-audio component is installed.\n")
+    sys.exit(1)
 
 class audio_source(gr.top_block):
     def __init__(self, host, port, pkt_size, sample_rate, eof):
diff --git a/gnuradio-examples/python/network/dial_tone_sink.py b/gnuradio-core/src/examples/network/dial_tone_sink.py
index 1b9009552..1b9009552 100755
--- a/gnuradio-examples/python/network/dial_tone_sink.py
+++ b/gnuradio-core/src/examples/network/dial_tone_sink.py
diff --git a/gnuradio-examples/python/network/dial_tone_source.py b/gnuradio-core/src/examples/network/dial_tone_source.py
index 766ecf16d..766ecf16d 100755
--- a/gnuradio-examples/python/network/dial_tone_source.py
+++ b/gnuradio-core/src/examples/network/dial_tone_source.py
diff --git a/gnuradio-examples/python/network/vector_sink.py b/gnuradio-core/src/examples/network/vector_sink.py
index 5d73858a3..5d73858a3 100755
--- a/gnuradio-examples/python/network/vector_sink.py
+++ b/gnuradio-core/src/examples/network/vector_sink.py
diff --git a/gnuradio-examples/python/network/vector_source.py b/gnuradio-core/src/examples/network/vector_source.py
index 0e7d67844..0e7d67844 100755
--- a/gnuradio-examples/python/network/vector_source.py
+++ b/gnuradio-core/src/examples/network/vector_source.py
diff --git a/gnuradio-examples/python/pfb/CMakeLists.txt b/gnuradio-core/src/examples/pfb/CMakeLists.txt
index 88fdf2ead..899c47b90 100644
--- a/gnuradio-examples/python/pfb/CMakeLists.txt
+++ b/gnuradio-core/src/examples/pfb/CMakeLists.txt
@@ -31,6 +31,6 @@ GR_PYTHON_INSTALL(PROGRAMS
   synth_to_chan.py
   reconstruction.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/pfb
-  COMPONENT "gnuradio_examples"
+  COMPONENT "core_python"
 )
 
diff --git a/gnuradio-examples/python/pfb/channelize.py b/gnuradio-core/src/examples/pfb/channelize.py
index 2fcb14a36..2fcb14a36 100755
--- a/gnuradio-examples/python/pfb/channelize.py
+++ b/gnuradio-core/src/examples/pfb/channelize.py
diff --git a/gnuradio-examples/python/pfb/chirp_channelize.py b/gnuradio-core/src/examples/pfb/chirp_channelize.py
index 951255d3b..951255d3b 100755
--- a/gnuradio-examples/python/pfb/chirp_channelize.py
+++ b/gnuradio-core/src/examples/pfb/chirp_channelize.py
diff --git a/gnuradio-examples/python/pfb/decimate.py b/gnuradio-core/src/examples/pfb/decimate.py
index 643a2c241..643a2c241 100755
--- a/gnuradio-examples/python/pfb/decimate.py
+++ b/gnuradio-core/src/examples/pfb/decimate.py
diff --git a/gnuradio-examples/python/pfb/fmtest.py b/gnuradio-core/src/examples/pfb/fmtest.py
index 635ee4e9e..635ee4e9e 100755
--- a/gnuradio-examples/python/pfb/fmtest.py
+++ b/gnuradio-core/src/examples/pfb/fmtest.py
diff --git a/gnuradio-examples/python/pfb/interpolate.py b/gnuradio-core/src/examples/pfb/interpolate.py
index 370cf26a7..370cf26a7 100755
--- a/gnuradio-examples/python/pfb/interpolate.py
+++ b/gnuradio-core/src/examples/pfb/interpolate.py
diff --git a/gnuradio-examples/python/pfb/reconstruction.py b/gnuradio-core/src/examples/pfb/reconstruction.py
index c7909f7a5..c7909f7a5 100755
--- a/gnuradio-examples/python/pfb/reconstruction.py
+++ b/gnuradio-core/src/examples/pfb/reconstruction.py
diff --git a/gnuradio-examples/python/pfb/resampler.py b/gnuradio-core/src/examples/pfb/resampler.py
index 7b296ca71..7b296ca71 100755
--- a/gnuradio-examples/python/pfb/resampler.py
+++ b/gnuradio-core/src/examples/pfb/resampler.py
diff --git a/gnuradio-examples/python/pfb/resampler_demo.grc b/gnuradio-core/src/examples/pfb/resampler_demo.grc
index 468636a5c..468636a5c 100644
--- a/gnuradio-examples/python/pfb/resampler_demo.grc
+++ b/gnuradio-core/src/examples/pfb/resampler_demo.grc
diff --git a/gnuradio-examples/python/pfb/synth_filter.py b/gnuradio-core/src/examples/pfb/synth_filter.py
index a91edfebf..a91edfebf 100755
--- a/gnuradio-examples/python/pfb/synth_filter.py
+++ b/gnuradio-core/src/examples/pfb/synth_filter.py
diff --git a/gnuradio-examples/python/pfb/synth_to_chan.py b/gnuradio-core/src/examples/pfb/synth_to_chan.py
index c6c80b2f8..c6c80b2f8 100755
--- a/gnuradio-examples/python/pfb/synth_to_chan.py
+++ b/gnuradio-core/src/examples/pfb/synth_to_chan.py
diff --git a/gnuradio-examples/python/tags/CMakeLists.txt b/gnuradio-core/src/examples/tags/CMakeLists.txt
index d2cd7b793..0ba1a4dd9 100644
--- a/gnuradio-examples/python/tags/CMakeLists.txt
+++ b/gnuradio-core/src/examples/tags/CMakeLists.txt
@@ -23,6 +23,6 @@ GR_PYTHON_INSTALL(PROGRAMS
   test_file_tags.py
   uhd_burst_detector.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/tags
-  COMPONENT "gnuradio_examples"
+  COMPONENT "core_python"
 )
 
diff --git a/gnuradio-examples/python/tags/test_file_tags.py b/gnuradio-core/src/examples/tags/test_file_tags.py
index 446986cd7..446986cd7 100755
--- a/gnuradio-examples/python/tags/test_file_tags.py
+++ b/gnuradio-core/src/examples/tags/test_file_tags.py
diff --git a/gnuradio-examples/python/tags/uhd_burst_detector.py b/gnuradio-core/src/examples/tags/uhd_burst_detector.py
index 7411ab06e..7411ab06e 100755
--- a/gnuradio-examples/python/tags/uhd_burst_detector.py
+++ b/gnuradio-core/src/examples/tags/uhd_burst_detector.py
diff --git a/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt b/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt
new file mode 100644
index 000000000..dfae03f83
--- /dev/null
+++ b/gnuradio-core/src/examples/volk_benchmark/CMakeLists.txt
@@ -0,0 +1,35 @@
+# Copyright 2012 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+include(GrPython)
+
+GR_PYTHON_INSTALL(PROGRAMS
+  volk_math.py
+  volk_plot.py
+  volk_test_funcs.py
+  volk_types.py
+  DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark
+  COMPONENT "core_python"
+)
+
+install(
+    FILES README
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark
+    COMPONENT "core_python"
+)
diff --git a/gnuradio-examples/python/volk_benchmark/README b/gnuradio-core/src/examples/volk_benchmark/README
index 516fc15bd..516fc15bd 100644
--- a/gnuradio-examples/python/volk_benchmark/README
+++ b/gnuradio-core/src/examples/volk_benchmark/README
diff --git a/gnuradio-examples/python/volk_benchmark/volk_math.py b/gnuradio-core/src/examples/volk_benchmark/volk_math.py
index 8bf9ed6f3..8bf9ed6f3 100755
--- a/gnuradio-examples/python/volk_benchmark/volk_math.py
+++ b/gnuradio-core/src/examples/volk_benchmark/volk_math.py
diff --git a/gnuradio-examples/python/volk_benchmark/volk_plot.py b/gnuradio-core/src/examples/volk_benchmark/volk_plot.py
index 823dfbf64..823dfbf64 100755
--- a/gnuradio-examples/python/volk_benchmark/volk_plot.py
+++ b/gnuradio-core/src/examples/volk_benchmark/volk_plot.py
diff --git a/gnuradio-examples/python/volk_benchmark/volk_test_funcs.py b/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py
index 4f4e4afd3..4f4e4afd3 100644
--- a/gnuradio-examples/python/volk_benchmark/volk_test_funcs.py
+++ b/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py
diff --git a/gnuradio-examples/python/volk_benchmark/volk_types.py b/gnuradio-core/src/examples/volk_benchmark/volk_types.py
index 3bc5a22ae..3bc5a22ae 100755
--- a/gnuradio-examples/python/volk_benchmark/volk_types.py
+++ b/gnuradio-core/src/examples/volk_benchmark/volk_types.py
diff --git a/gnuradio-examples/CMakeLists.txt b/gnuradio-examples/CMakeLists.txt
deleted file mode 100644
index 6aec5a947..000000000
--- a/gnuradio-examples/CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2012 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
-
-########################################################################
-# Setup dependencies
-########################################################################
-
-include(GrPython) #used for code generation
-
-########################################################################
-# Register component
-########################################################################
-include(GrComponent)
-GR_REGISTER_COMPONENT("gnuradio-examples" ENABLE_GR_EXAMPLES
-    ENABLE_GRUEL
-    ENABLE_VOLK
-    ENABLE_GR_CORE
-)
-
-########################################################################
-# Begin conditional configuration
-########################################################################
-if(ENABLE_GR_EXAMPLES)
-
-########################################################################
-# Setup CPack components
-########################################################################
-include(GrPackage)
-CPACK_SET(CPACK_COMPONENT_GROUP_EXAMPLE_DESCRIPTION "GNU Radio Examples")
-
-CPACK_COMPONENT("gnuradio_examples"
-    GROUP        "Examples"
-    DISPLAY_NAME "GNU Radio Examples"
-    DESCRIPTION  "GNU Radio Examples"
-    DEPENDS      "core_runtime,core_python,gruel_runtime,gruel_python"
-)
-
-########################################################################
-# Add subdirectories
-########################################################################
-if(ENABLE_PYTHON)
-    add_subdirectory(grc)
-    add_subdirectory(python)
-endif(ENABLE_PYTHON)
-
-endif(ENABLE_GR_EXAMPLES)
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt
index 12fca6009..33d257e59 100644
--- a/gr-digital/examples/CMakeLists.txt
+++ b/gr-digital/examples/CMakeLists.txt
@@ -19,6 +19,7 @@
 
 include(GrPython)
 
+# Base stuff
 GR_PYTHON_INSTALL(PROGRAMS
     example_costas.py
     example_fll.py
@@ -30,6 +31,7 @@ GR_PYTHON_INSTALL(PROGRAMS
     COMPONENT "digital_python"
 )
 
+# Narrowband
 GR_PYTHON_INSTALL(PROGRAMS
     narrowband/transmit_path.py
     narrowband/receive_path.py
@@ -45,6 +47,7 @@ GR_PYTHON_INSTALL(PROGRAMS
     COMPONENT "digital_python"
 )
 
+# OFDM
 GR_PYTHON_INSTALL(PROGRAMS
     ofdm/benchmark_add_channel.py
     ofdm/benchmark_rx.py
@@ -58,3 +61,16 @@ GR_PYTHON_INSTALL(PROGRAMS
     DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/ofdm
     COMPONENT "digital_python"
 )
+
+# DEMOD
+install(
+    FILES
+    demod/digital_freq_lock.grc
+    demod/mpsk_demod.grc
+    demod/pam_sync.grc
+    demod/pam_timing.grc
+    demod/ber_simulation.grc
+    demod/dpsk_loopback.grc   
+    DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/demod
+    COMPONENT "digital_python"
+)
diff --git a/gnuradio-examples/grc/simple/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc
index 618add29c..6a9361ed1 100644
--- a/gnuradio-examples/grc/simple/ber_simulation.grc
+++ b/gr-digital/examples/demod/ber_simulation.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Thu Mar 19 11:08:59 2009</timestamp>
+  <timestamp>Tue Apr  3 18:11:51 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -36,6 +36,14 @@
       <value>Custom</value>
     </param>
     <param>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>realtime_scheduling</key>
       <value></value>
     </param>
@@ -84,41 +92,6 @@
     </param>
   </block>
   <block>
-    <key>gr_chunks_to_symbols_xx</key>
-    <param>
-      <key>id</key>
-      <value>gr_chunks_to_symbols_xx</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>in_type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>out_type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>symbol_table</key>
-      <value>const</value>
-    </param>
-    <param>
-      <key>dimension</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(360, 237)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>wxgui_numbersink2</key>
     <param>
       <key>id</key>
@@ -145,10 +118,6 @@
       <value>samp_rate</value>
     </param>
     <param>
-      <key>base_value</key>
-      <value>0.0</value>
-    </param>
-    <param>
       <key>min_value</key>
       <value>0.0</value>
     </param>
@@ -189,10 +158,18 @@
       <value>False</value>
     </param>
     <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
       <key>grid_pos</key>
       <value>1, 0, 1, 1</value>
     </param>
     <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(1062, 11)</value>
     </param>
@@ -233,30 +210,22 @@
     </param>
   </block>
   <block>
-    <key>blks2_error_rate</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>blks2_error_rate</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>'BER'</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value>1000000</value>
-    </param>
-    <param>
-      <key>bits_per_symbol</key>
-      <value>int(math.log(len(const))/math.log(2))</value>
+      <key>value</key>
+      <value>50e3</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(670, 41)</value>
+      <value>(20, 168)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -264,26 +233,22 @@
     </param>
   </block>
   <block>
-    <key>gr_constellation_decoder_cb</key>
+    <key>import</key>
     <param>
       <key>id</key>
-      <value>gr_constellation_decoder_cb</value>
+      <value>import</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>sym_position</key>
-      <value>const</value>
-    </param>
-    <param>
-      <key>sym_value_out</key>
-      <value>range(len(const))</value>
+      <key>import</key>
+      <value>import math</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(708, 224)</value>
+      <value>(138, 168)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -291,10 +256,10 @@
     </param>
   </block>
   <block>
-    <key>random_source_x</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>random_source_x</value>
+      <value>wxgui_scopesink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -302,27 +267,63 @@
     </param>
     <param>
       <key>type</key>
-      <value>byte</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>min</key>
+      <key>title</key>
+      <value>"Constellation: "+str(const)</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
       <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>len(const)</value>
+      <key>v_offset</key>
+      <value>0</value>
     </param>
     <param>
-      <key>num_samps</key>
-      <value>1000000</value>
+      <key>t_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>repeat</key>
+      <key>ac_couple</key>
       <value>False</value>
     </param>
     <param>
+      <key>xy_mode</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>2, 0, 1, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(15, 244)</value>
+      <value>(828, 368)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -330,22 +331,53 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>gr_add_xx</key>
     <param>
       <key>id</key>
-      <value>noise</value>
+      <value>gr_add_xx</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>.25</value>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(18, 386)</value>
+      <value>(652, 395)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_constellation_decoder_cb</key>
+    <param>
+      <key>id</key>
+      <value>digital_constellation_decoder_cb_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>constellation</key>
+      <value>const.base()</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(693, 205)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -364,7 +396,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>1+1j, 1-1j, -1-1j, -1+1j</value>
+      <value>digital.qpsk_constellation()</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -379,7 +411,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>const_points</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -387,11 +419,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>50e3</value>
+      <value>const.points()</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(20, 168)</value>
+      <value>(17, 532)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -399,22 +431,38 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>random_source_x</key>
     <param>
       <key>id</key>
-      <value>import</value>
+      <value>random_source_x</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import math</value>
+      <key>type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>len(const_points)</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>1000000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(138, 168)</value>
+      <value>(15, 244)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -422,30 +470,38 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>gr_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx</value>
+      <value>gr_chunks_to_symbols_xx</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
+      <key>in_type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>out_type</key>
       <value>complex</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>2</value>
+      <key>symbol_table</key>
+      <value>const_points</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>dimension</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>num_ports</key>
       <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(652, 395)</value>
+      <value>(367, 260)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -453,10 +509,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>blks2_error_rate</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>blks2_error_rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -464,43 +520,74 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>'BER'</value>
     </param>
     <param>
-      <key>title</key>
-      <value>"Constellation: "+str(const)</value>
+      <key>win_size</key>
+      <value>1000000</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>bits_per_symbol</key>
+      <value>int(math.log(len(const_points))/math.log(2))</value>
     </param>
     <param>
-      <key>v_scale</key>
-      <value>0</value>
+      <key>_coordinate</key>
+      <value>(670, 41)</value>
     </param>
     <param>
-      <key>t_scale</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>id</key>
+      <value>noise</value>
     </param>
     <param>
-      <key>xy_mode</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>num_inputs</key>
+      <key>label</key>
+      <value>AWGN Noise</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>0.10</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
       <value>1</value>
     </param>
     <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
       <key>grid_pos</key>
-      <value>2, 0, 1, 1</value>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(828, 368)</value>
+      <value>(268, 481)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -520,18 +607,6 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_constellation_decoder_cb</source_block_id>
-    <sink_block_id>blks2_error_rate</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>1</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>gr_add_xx</source_block_id>
-    <sink_block_id>gr_constellation_decoder_cb</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>gr_chunks_to_symbols_xx</source_block_id>
     <sink_block_id>gr_add_xx</sink_block_id>
     <source_key>0</source_key>
@@ -561,4 +636,16 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>digital_constellation_decoder_cb_0</source_block_id>
+    <sink_block_id>blks2_error_rate</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gr_add_xx</source_block_id>
+    <sink_block_id>digital_constellation_decoder_cb_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
 </flow_graph>
diff --git a/gnuradio-examples/grc/demod/digital_freq_lock.grc b/gr-digital/examples/demod/digital_freq_lock.grc
index 36037febb..36037febb 100644
--- a/gnuradio-examples/grc/demod/digital_freq_lock.grc
+++ b/gr-digital/examples/demod/digital_freq_lock.grc
diff --git a/gnuradio-examples/grc/simple/dpsk_loopback.grc b/gr-digital/examples/demod/dpsk_loopback.grc
index 6a507c98d..aef6a7738 100644
--- a/gnuradio-examples/grc/simple/dpsk_loopback.grc
+++ b/gr-digital/examples/demod/dpsk_loopback.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Tue Mar 17 12:53:37 2009</timestamp>
+  <timestamp>Tue Apr  3 18:03:52 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -36,47 +36,20 @@
       <value>Custom</value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(10, 10)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_dxpsk_mod</key>
-    <param>
-      <key>id</key>
-      <value>blks2_dxpsk_mod_0</value>
+      <key>run_options</key>
+      <value>prompt</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>run</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>dbpsk</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
-    </param>
-    <param>
-      <key>gray_code</key>
-      <value>True</value>
+      <key>realtime_scheduling</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(426, 295)</value>
+      <value>(10, 10)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -137,63 +110,24 @@
       <value>100</value>
     </param>
     <param>
-      <key>slider_length</key>
-      <value>200</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
       <value></value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(12, 257)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_packet_encoder</key>
-    <param>
-      <key>id</key>
-      <value>blks2_packet_encoder_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>bits_per_symbol</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>access_code</key>
+      <key>notebook</key>
       <value></value>
     </param>
     <param>
-      <key>pad_for_usrp</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>payload_length</key>
-      <value>0</value>
-    </param>
-    <param>
       <key>_coordinate</key>
-      <value>(216, 260)</value>
+      <value>(12, 257)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -306,10 +240,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>digital_dxpsk_demod</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>digital_dxpsk_demod_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -317,43 +251,51 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>dbpsk</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Scope Plot</value>
+      <key>samples_per_symbol</key>
+      <value>2</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>excess_bw</key>
+      <value>0.35</value>
     </param>
     <param>
-      <key>frame_decim</key>
-      <value>15</value>
+      <key>freq_bw</key>
+      <value>6.28/100.0</value>
     </param>
     <param>
-      <key>v_scale</key>
-      <value>0</value>
+      <key>phase_bw</key>
+      <value>6.28/100.0</value>
     </param>
     <param>
-      <key>t_scale</key>
-      <value>1./freq</value>
+      <key>timing_bw</key>
+      <value>6.28/100.0</value>
     </param>
     <param>
-      <key>marker</key>
-      <value>set_format_line</value>
+      <key>omega_relative_limit</key>
+      <value>0.005</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>gray_coded</key>
+      <value>True</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>sync_out</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(769, 12)</value>
+      <value>(639, 254)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -361,10 +303,10 @@
     </param>
   </block>
   <block>
-    <key>blks2_dxpsk_demod</key>
+    <key>digital_dxpsk_mod</key>
     <param>
       <key>id</key>
-      <value>blks2_dxpsk_demod_0</value>
+      <value>digital_dxpsk_mod_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -383,28 +325,138 @@
       <value>0.35</value>
     </param>
     <param>
-      <key>costas_alpha</key>
-      <value>0.175</value>
+      <key>gray_coded</key>
+      <value>True</value>
     </param>
     <param>
-      <key>gain_mu</key>
-      <value>0.175</value>
+      <key>verbose</key>
+      <value>False</value>
     </param>
     <param>
-      <key>mu</key>
-      <value>0.5</value>
+      <key>log</key>
+      <value>False</value>
     </param>
     <param>
-      <key>omega_relative_limit</key>
-      <value>0.005</value>
+      <key>_coordinate</key>
+      <value>(421, 294)</value>
     </param>
     <param>
-      <key>gray_code</key>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>blks2_packet_encoder</key>
+    <param>
+      <key>id</key>
+      <value>blks2_packet_encoder_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>samples_per_symbol</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>bits_per_symbol</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>access_code</key>
+      <value></value>
+    </param>
+    <param>
+      <key>pad_for_usrp</key>
       <value>True</value>
     </param>
     <param>
+      <key>payload_length</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(691, 219)</value>
+      <value>(216, 286)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_scopesink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_scopesink2_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>Scope Plot</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>v_offset</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>t_scale</key>
+      <value>1./freq</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(760, 41)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -412,38 +464,38 @@
     </param>
   </block>
   <connection>
-    <source_block_id>blks2_dxpsk_mod_0</source_block_id>
-    <sink_block_id>blks2_dxpsk_demod_0</sink_block_id>
+    <source_block_id>gr_sig_source_x_0</source_block_id>
+    <sink_block_id>gr_throttle_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_dxpsk_demod_0</source_block_id>
-    <sink_block_id>blks2_packet_decoder_0</sink_block_id>
+    <source_block_id>gr_throttle_0_0</source_block_id>
+    <sink_block_id>blks2_packet_encoder_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_packet_encoder_0</source_block_id>
-    <sink_block_id>blks2_dxpsk_mod_0</sink_block_id>
+    <source_block_id>blks2_packet_decoder_0</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_sig_source_x_0</source_block_id>
-    <sink_block_id>gr_throttle_0_0</sink_block_id>
+    <source_block_id>digital_dxpsk_demod_0</source_block_id>
+    <sink_block_id>blks2_packet_decoder_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_throttle_0_0</source_block_id>
-    <sink_block_id>blks2_packet_encoder_0</sink_block_id>
+    <source_block_id>digital_dxpsk_mod_0</source_block_id>
+    <sink_block_id>digital_dxpsk_demod_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_packet_decoder_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_block_id>blks2_packet_encoder_0</source_block_id>
+    <sink_block_id>digital_dxpsk_mod_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gnuradio-examples/grc/demod/mpsk_demod.grc b/gr-digital/examples/demod/mpsk_demod.grc
index 08108dcba..d7cca9661 100644
--- a/gnuradio-examples/grc/demod/mpsk_demod.grc
+++ b/gr-digital/examples/demod/mpsk_demod.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Oct  5 18:34:52 2009</timestamp>
+  <timestamp>Tue Apr  3 18:01:57 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -80,119 +80,6 @@
     </param>
   </block>
   <block>
-    <key>random_source_x</key>
-    <param>
-      <key>id</key>
-      <value>random_source_x_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>2**8</value>
-    </param>
-    <param>
-      <key>num_samps</key>
-      <value>10000</value>
-    </param>
-    <param>
-      <key>repeat</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(155, 160)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>blks2_dxpsk_mod</key>
-    <param>
-      <key>id</key>
-      <value>blks2_dxpsk_mod_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>dqpsk</value>
-    </param>
-    <param>
-      <key>samples_per_symbol</key>
-      <value>samps_per_sym</value>
-    </param>
-    <param>
-      <key>excess_bw</key>
-      <value>0.35</value>
-    </param>
-    <param>
-      <key>gray_code</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>verbose</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(391, 54)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_throttle</key>
-    <param>
-      <key>id</key>
-      <value>gr_throttle_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(654, 142)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable</key>
     <param>
       <key>id</key>
@@ -216,45 +103,6 @@
     </param>
   </block>
   <block>
-    <key>gr_channel_model</key>
-    <param>
-      <key>id</key>
-      <value>gr_channel_model_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>noise_voltage</key>
-      <value>noise</value>
-    </param>
-    <param>
-      <key>freq_offset</key>
-      <value>freq_off</value>
-    </param>
-    <param>
-      <key>epsilon</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>taps</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>seed</key>
-      <value>42</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(487, 282)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable_slider</key>
     <param>
       <key>id</key>
@@ -434,8 +282,8 @@
       <value>0</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>0.005</value>
+      <key>loop_bw</key>
+      <value>6.28/100.0</value>
     </param>
     <param>
       <key>fmax</key>
@@ -458,6 +306,10 @@
       <value>0.005</value>
     </param>
     <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
       <key>grid_pos</key>
       <value></value>
     </param>
@@ -537,6 +389,14 @@
       <value>0</value>
     </param>
     <param>
+      <key>win</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
       <key>grid_pos</key>
       <value></value>
     </param>
@@ -553,33 +413,185 @@
       <value>0</value>
     </param>
   </block>
+  <block>
+    <key>gr_channel_model</key>
+    <param>
+      <key>id</key>
+      <value>gr_channel_model_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>noise_voltage</key>
+      <value>noise</value>
+    </param>
+    <param>
+      <key>freq_offset</key>
+      <value>freq_off</value>
+    </param>
+    <param>
+      <key>epsilon</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(487, 282)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gr_throttle</key>
+    <param>
+      <key>id</key>
+      <value>gr_throttle_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(633, 82)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
+    <param>
+      <key>id</key>
+      <value>random_source_x_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2**8</value>
+    </param>
+    <param>
+      <key>num_samps</key>
+      <value>10000</value>
+    </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(161, 119)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_dxpsk_mod</key>
+    <param>
+      <key>id</key>
+      <value>digital_dxpsk_mod_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>dqpsk</value>
+    </param>
+    <param>
+      <key>samples_per_symbol</key>
+      <value>samps_per_sym</value>
+    </param>
+    <param>
+      <key>excess_bw</key>
+      <value>0.35</value>
+    </param>
+    <param>
+      <key>gray_coded</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(361, 119)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
   <connection>
-    <source_block_id>random_source_x_0</source_block_id>
-    <sink_block_id>blks2_dxpsk_mod_0</sink_block_id>
+    <source_block_id>gr_throttle_0</source_block_id>
+    <sink_block_id>wxgui_constellationsink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>gr_throttle_0</source_block_id>
-    <sink_block_id>wxgui_constellationsink2_0</sink_block_id>
+    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_throttle_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <source_block_id>gr_channel_model_0</source_block_id>
+    <sink_block_id>gr_throttle_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_dxpsk_mod_0</source_block_id>
+    <source_block_id>digital_dxpsk_mod_0</source_block_id>
     <sink_block_id>gr_channel_model_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_channel_model_0</source_block_id>
-    <sink_block_id>gr_throttle_0</sink_block_id>
+    <source_block_id>random_source_x_0</source_block_id>
+    <sink_block_id>digital_dxpsk_mod_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gnuradio-examples/grc/demod/pam_sync.grc b/gr-digital/examples/demod/pam_sync.grc
index 8571995a5..8571995a5 100644
--- a/gnuradio-examples/grc/demod/pam_sync.grc
+++ b/gr-digital/examples/demod/pam_sync.grc
diff --git a/gnuradio-examples/grc/demod/pam_timing.grc b/gr-digital/examples/demod/pam_timing.grc
index 02130f481..02130f481 100644
--- a/gnuradio-examples/grc/demod/pam_timing.grc
+++ b/gr-digital/examples/demod/pam_timing.grc
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 997aa56b1..8be5d7fbc 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -121,5 +121,6 @@ add_subdirectory(grc_gnuradio)
 add_subdirectory(gui)
 add_subdirectory(python)
 add_subdirectory(scripts)
+add_subdirectory(examples)
 
 endif(ENABLE_GRC)
diff --git a/gnuradio-examples/grc/CMakeLists.txt b/grc/examples/CMakeLists.txt
index 680172cfa..acb65dbdc 100644
--- a/gnuradio-examples/grc/CMakeLists.txt
+++ b/grc/examples/CMakeLists.txt
@@ -17,25 +17,12 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-# DEMOD
-install(
-    FILES
-    demod/digital_freq_lock.grc
-    demod/mpsk_demod.grc
-    demod/pam_sync.grc
-    demod/pam_timing.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/demod
-    COMPONENT "gnuadio-examples"
-)
-
 # SIMPLE
 install(
     FILES
-    simple/ber_simulation.grc
-    simple/dpsk_loopback.grc
     simple/variable_config.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/simple
-    COMPONENT "gnuadio-examples"
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/simple
+    COMPONENT "grc"
 )
 
 # XMLRPC
@@ -45,6 +32,6 @@ install(
     xmlrpc/xmlrpc_client.grc
     xmlrpc/xmlrpc_client_script.py
     xmlrpc/xmlrpc_server.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/xmlrpc
-    COMPONENT "gnuadio-examples"
+    DESTINATION ${GR_PKG_DATA_DIR}/examples/grc/xmlrpc
+    COMPONENT "grc"
 )
diff --git a/gnuradio-examples/grc/simple/variable_config.grc b/grc/examples/simple/variable_config.grc
index 95c287cce..95c287cce 100644
--- a/gnuradio-examples/grc/simple/variable_config.grc
+++ b/grc/examples/simple/variable_config.grc
diff --git a/gnuradio-examples/grc/xmlrpc/readme.txt b/grc/examples/xmlrpc/readme.txt
index c1f87c1cb..c1f87c1cb 100644
--- a/gnuradio-examples/grc/xmlrpc/readme.txt
+++ b/grc/examples/xmlrpc/readme.txt
diff --git a/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc b/grc/examples/xmlrpc/xmlrpc_client.grc
index 3bb4e7ed3..3bb4e7ed3 100644
--- a/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc
+++ b/grc/examples/xmlrpc/xmlrpc_client.grc
diff --git a/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py b/grc/examples/xmlrpc/xmlrpc_client_script.py
index 956fa07fb..956fa07fb 100644
--- a/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py
+++ b/grc/examples/xmlrpc/xmlrpc_client_script.py
diff --git a/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc b/grc/examples/xmlrpc/xmlrpc_server.grc
index dc539ef1b..dc539ef1b 100644
--- a/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc
+++ b/grc/examples/xmlrpc/xmlrpc_server.grc