diff --git a/gr-analog/python/CMakeLists.txt b/gr-analog/python/analog/CMakeLists.txt
index a3f789ddfa..a3f789ddfa 100644
--- a/gr-analog/python/CMakeLists.txt
+++ b/gr-analog/python/analog/CMakeLists.txt

diff --git a/gr-analog/python/__init__.py b/gr-analog/python/analog/__init__.py
index a5ab5715d7..836d4ba935 100644
--- a/gr-analog/python/__init__.py
+++ b/gr-analog/python/analog/__init__.py

diff --git a/gr-analog/python/am_demod.py b/gr-analog/python/analog/am_demod.py
index 3459e825f4..3459e825f4 100644
--- a/gr-analog/python/am_demod.py
+++ b/gr-analog/python/analog/am_demod.py

diff --git a/gr-analog/python/fm_demod.py b/gr-analog/python/analog/fm_demod.py
index 1976a076ca..1976a076ca 100644
--- a/gr-analog/python/fm_demod.py
+++ b/gr-analog/python/analog/fm_demod.py

diff --git a/gr-analog/python/fm_emph.py b/gr-analog/python/analog/fm_emph.py
index 2821f6e3cd..2821f6e3cd 100644
--- a/gr-analog/python/fm_emph.py
+++ b/gr-analog/python/analog/fm_emph.py

diff --git a/gr-analog/python/nbfm_rx.py b/gr-analog/python/analog/nbfm_rx.py
index b2c86db70f..b2c86db70f 100644
--- a/gr-analog/python/nbfm_rx.py
+++ b/gr-analog/python/analog/nbfm_rx.py

diff --git a/gr-analog/python/nbfm_tx.py b/gr-analog/python/analog/nbfm_tx.py
index 62b56bae52..62b56bae52 100644
--- a/gr-analog/python/nbfm_tx.py
+++ b/gr-analog/python/analog/nbfm_tx.py

diff --git a/gr-analog/python/qa_agc.py b/gr-analog/python/analog/qa_agc.py
index 2733ed3fae..2733ed3fae 100755
--- a/gr-analog/python/qa_agc.py
+++ b/gr-analog/python/analog/qa_agc.py

diff --git a/gr-analog/python/qa_cpfsk.py b/gr-analog/python/analog/qa_cpfsk.py
index decf94ea3f..decf94ea3f 100755
--- a/gr-analog/python/qa_cpfsk.py
+++ b/gr-analog/python/analog/qa_cpfsk.py

diff --git a/gr-analog/python/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
index 08d3dbfef8..08d3dbfef8 100755
--- a/gr-analog/python/qa_ctcss_squelch.py
+++ b/gr-analog/python/analog/qa_ctcss_squelch.py

diff --git a/gr-analog/python/qa_dpll.py b/gr-analog/python/analog/qa_dpll.py
index 3ef8a6e285..3ef8a6e285 100755
--- a/gr-analog/python/qa_dpll.py
+++ b/gr-analog/python/analog/qa_dpll.py

diff --git a/gr-analog/python/qa_fastnoise.py b/gr-analog/python/analog/qa_fastnoise.py
index 040cf47522..040cf47522 100644
--- a/gr-analog/python/qa_fastnoise.py
+++ b/gr-analog/python/analog/qa_fastnoise.py

diff --git a/gr-analog/python/qa_fmdet.py b/gr-analog/python/analog/qa_fmdet.py
index a76ac1d247..a76ac1d247 100755
--- a/gr-analog/python/qa_fmdet.py
+++ b/gr-analog/python/analog/qa_fmdet.py

diff --git a/gr-analog/python/qa_frequency_modulator.py b/gr-analog/python/analog/qa_frequency_modulator.py
index b673b3275c..b673b3275c 100755
--- a/gr-analog/python/qa_frequency_modulator.py
+++ b/gr-analog/python/analog/qa_frequency_modulator.py

diff --git a/gr-analog/python/qa_noise.py b/gr-analog/python/analog/qa_noise.py
index dd94fc231f..dd94fc231f 100755
--- a/gr-analog/python/qa_noise.py
+++ b/gr-analog/python/analog/qa_noise.py

diff --git a/gr-analog/python/qa_phase_modulator.py b/gr-analog/python/analog/qa_phase_modulator.py
index a9c8c84597..a9c8c84597 100755
--- a/gr-analog/python/qa_phase_modulator.py
+++ b/gr-analog/python/analog/qa_phase_modulator.py

diff --git a/gr-analog/python/qa_pll_carriertracking.py b/gr-analog/python/analog/qa_pll_carriertracking.py
index e383639d49..e383639d49 100755
--- a/gr-analog/python/qa_pll_carriertracking.py
+++ b/gr-analog/python/analog/qa_pll_carriertracking.py

diff --git a/gr-analog/python/qa_pll_freqdet.py b/gr-analog/python/analog/qa_pll_freqdet.py
index cc8757c965..cc8757c965 100755
--- a/gr-analog/python/qa_pll_freqdet.py
+++ b/gr-analog/python/analog/qa_pll_freqdet.py

diff --git a/gr-analog/python/qa_pll_refout.py b/gr-analog/python/analog/qa_pll_refout.py
index c63136bc0c..c63136bc0c 100755
--- a/gr-analog/python/qa_pll_refout.py
+++ b/gr-analog/python/analog/qa_pll_refout.py

diff --git a/gr-analog/python/qa_probe_avg_mag_sqrd.py b/gr-analog/python/analog/qa_probe_avg_mag_sqrd.py
index 5c6c97e450..5c6c97e450 100755
--- a/gr-analog/python/qa_probe_avg_mag_sqrd.py
+++ b/gr-analog/python/analog/qa_probe_avg_mag_sqrd.py

diff --git a/gr-analog/python/qa_pwr_squelch.py b/gr-analog/python/analog/qa_pwr_squelch.py
index dd42c7fb90..dd42c7fb90 100755
--- a/gr-analog/python/qa_pwr_squelch.py
+++ b/gr-analog/python/analog/qa_pwr_squelch.py

diff --git a/gr-analog/python/qa_quadrature_demod.py b/gr-analog/python/analog/qa_quadrature_demod.py
index e38ea72a7d..e38ea72a7d 100755
--- a/gr-analog/python/qa_quadrature_demod.py
+++ b/gr-analog/python/analog/qa_quadrature_demod.py

diff --git a/gr-analog/python/qa_rail_ff.py b/gr-analog/python/analog/qa_rail_ff.py
index 5bcf01c6b7..5bcf01c6b7 100755
--- a/gr-analog/python/qa_rail_ff.py
+++ b/gr-analog/python/analog/qa_rail_ff.py

diff --git a/gr-analog/python/qa_sig_source.py b/gr-analog/python/analog/qa_sig_source.py
index bc48333ed1..bc48333ed1 100755
--- a/gr-analog/python/qa_sig_source.py
+++ b/gr-analog/python/analog/qa_sig_source.py

diff --git a/gr-analog/python/qa_simple_squelch.py b/gr-analog/python/analog/qa_simple_squelch.py
index 9fa112864f..9fa112864f 100755
--- a/gr-analog/python/qa_simple_squelch.py
+++ b/gr-analog/python/analog/qa_simple_squelch.py

diff --git a/gr-analog/python/standard_squelch.py b/gr-analog/python/analog/standard_squelch.py
index 3ed9ebceaa..3ed9ebceaa 100644
--- a/gr-analog/python/standard_squelch.py
+++ b/gr-analog/python/analog/standard_squelch.py

diff --git a/gr-analog/python/wfm_rcv.py b/gr-analog/python/analog/wfm_rcv.py
index d35d219275..d35d219275 100644
--- a/gr-analog/python/wfm_rcv.py
+++ b/gr-analog/python/analog/wfm_rcv.py

diff --git a/gr-analog/python/wfm_rcv_fmdet.py b/gr-analog/python/analog/wfm_rcv_fmdet.py
index f3627d378d..f3627d378d 100644
--- a/gr-analog/python/wfm_rcv_fmdet.py
+++ b/gr-analog/python/analog/wfm_rcv_fmdet.py

diff --git a/gr-analog/python/wfm_rcv_pll.py b/gr-analog/python/analog/wfm_rcv_pll.py
index 7452de731f..7452de731f 100644
--- a/gr-analog/python/wfm_rcv_pll.py
+++ b/gr-analog/python/analog/wfm_rcv_pll.py

diff --git a/gr-analog/python/wfm_tx.py b/gr-analog/python/analog/wfm_tx.py
index be662310db..be662310db 100644
--- a/gr-analog/python/wfm_tx.py
+++ b/gr-analog/python/analog/wfm_tx.py