196 files changed, 616 insertions, 504 deletions
diff --git a/gr-atsc/CMakeLists.txt b/gr-atsc/CMakeLists.txt
index 26f99a1573..df7ac54f00 100644
--- a/gr-atsc/CMakeLists.txt
+++ b/gr-atsc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -29,10 +29,15 @@ include(GrComponent)
 GR_REGISTER_COMPONENT("gr-atsc" ENABLE_GR_ATSC
     Boost_FOUND
     ENABLE_GR_CORE
+    ENABLE_GR_FFT
+    ENABLE_GR_BLOCKS
+    ENABLE_GR_FILTER
+    ENABLE_GR_ANALOG
 )
 
 GR_SET_GLOBAL(GR_ATSC_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}/lib
 )
 
 ########################################################################
@@ -84,9 +89,11 @@ CPACK_COMPONENT("atsc_swig"
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(src/lib)
+add_subdirectory(lib)
+add_subdirectory(include/atsc)
 if(ENABLE_PYTHON)
-    add_subdirectory(src/python)
+    add_subdirectory(swig)
+    add_subdirectory(python)
 endif(ENABLE_PYTHON)
 
 ########################################################################
diff --git a/gr-atsc/include/atsc/CMakeLists.txt b/gr-atsc/include/atsc/CMakeLists.txt
new file mode 100644
index 0000000000..cdf818aab2
--- /dev/null
+++ b/gr-atsc/include/atsc/CMakeLists.txt
@@ -0,0 +1,103 @@
+# Copyright 2013 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.
+
+########################################################################
+# Install header files
+########################################################################
+install(FILES
+    api.h
+    basic_trellis_encoder_impl.h
+    bit_timing_loop.h
+    CMakeLists.txt
+    consts.h
+    convolutional_interleaver.h
+    create_atsci_equalizer.h
+    create_atsci_fs_checker.h
+    create_atsci_fs_correlator.h
+    data_interleaver_impl.h
+    deinterleaver.h
+    depad.h
+    derandomizer.h
+    diag_output_impl.h
+    ds_to_softds.h
+    equalizer.h
+    equalizer_impl.h
+    equalizer_lms2_impl.h
+    equalizer_lms_impl.h
+    equalizer_nop_impl.h
+    exp2_lp_impl.h
+    fake_single_viterbi_impl.h
+    field_sync_demux.h
+    field_sync_mux.h
+    fpll.h
+    fs_checker.h
+    fs_checker_impl.h
+    fs_checker_naive_impl.h
+    fs_correlator_impl.h
+    fs_correlator_naive_impl.h
+    GrAtscBitTimingLoop2.h
+    GrAtscBitTimingLoop3.h
+    GrAtscBitTimingLoop.h
+    GrAtscConvert2xTo20.h
+    GrAtscDataSegToSoftDataSeg.h
+    GrAtscDeinterleaver.h
+    GrAtscDerandomizer.h
+    GrAtscEqualizer.h
+    GrAtscFieldSyncChecker.h
+    GrAtscFieldSyncCorrelator.h
+    GrAtscFieldSyncDemux.h
+    GrAtscFieldSyncMux.h
+    GrAtscFPLL.h
+    GrAtscInterleaver.h
+    GrAtscRandomizer.h
+    GrAtscRSDecoder.h
+    GrAtscRSEncoder.h
+    GrAtscSegSymSync.h
+    GrAtscSegSymSyncImpl_export.h
+    GrAtscSegSymSyncImpl.h
+    GrAtscSymbolMapper.h
+    GrAtscTrellisEncoder.h
+    GrAtscViterbiDecoder.h
+    interleaver_fifo.h
+    interleaver.h
+    pad.h
+    pnXXX_impl.h
+    randomizer.h
+    randomizer_impl.h
+    reed_solomon_impl.h
+    root_raised_cosine_bandpass_impl.h
+    root_raised_cosine_impl.h
+    rs_decoder.h
+    rs_encoder.h
+    single_viterbi_impl.h
+    slicer_agc_impl.h
+    sliding_correlator_impl.h
+    sssr_impl.h
+    syminfo_impl.h
+    sync_tag_impl.h
+    trellis_encoder.h
+    trellis_encoder_impl.h
+    types.h
+    viterbi_decoder.h
+    viterbi_decoder_impl.h
+    vsbtx_lp_impl.h
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/atsc
+    COMPONENT "atsc_devel"
+)
+
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop.h b/gr-atsc/include/atsc/GrAtscBitTimingLoop.h
index fa64f4d372..1bedbb39ec 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop.h
+++ b/gr-atsc/include/atsc/GrAtscBitTimingLoop.h
@@ -23,16 +23,16 @@
 #ifndef _GRATSCBITTIMINGLOOP_H_
 #define _GRATSCBITTIMINGLOOP_H_
 
-#include <gr_nco.h>
+#include <blocks/nco.h>
 #include <VrSigProc.h>
 #include <VrHistoryProc.h>
 #include <VrDecimatingSigProc.h>
-#include <interleaver_fifo.h>
-#include <gr_single_pole_iir.h>
-#include <gr_mmse_fir_interpolator.h>
-#include <atsci_slicer_agc.h>
+#include <atsc/interleaver_fifo.h>
+#include <filter/single_pole_iir.h>
+#include <filter/mmse_fir_interpolator.h>
+#include <atsc/slicer_agc_impl.h>
 #include <stdio.h>
-#include <atsci_diag_output.h>
+#include <atsc/diag_output_impl.h>
 
 
 /*!
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop2.h b/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h
index 4f36c902e5..64d25da01e 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop2.h
+++ b/gr-atsc/include/atsc/GrAtscBitTimingLoop2.h
@@ -23,13 +23,13 @@
 #ifndef _GRATSCBITTIMINGLOOP2_H_
 #define _GRATSCBITTIMINGLOOP2_H_
 
-#include <gr_nco.h>
+#include <blocks/nco.h>
 #include <VrSigProc.h>
 #include <VrHistoryProc.h>
 #include <VrDecimatingSigProc.h>
-#include <interleaver_fifo.h>
-#include <gr_single_pole_iir.h>
-#include <gr_mmse_fir_interpolator.h>
+#include <atsc/interleaver_fifo.h>
+#include <filtersingle_pole_iir.h>
+#include <filter/mmse_fir_interpolator.h>
 
 /*!
  * \brief ATSC BitTimingLoop
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop3.h b/gr-atsc/include/atsc/GrAtscBitTimingLoop3.h
index 7e019e49c7..c0fb333ace 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop3.h
+++ b/gr-atsc/include/atsc/GrAtscBitTimingLoop3.h
@@ -25,9 +25,9 @@
 
 #include <cstdio>
 #include <VrDecimatingSigProc.h>
-#include <atsci_diag_output.h>
-#include <atsci_sssr.h>
-#include <atsci_syminfo.h>
+#include <atsc/diag_output_impl.h>
+#include <atsc/sssr_impl.h>
+#include <atsc/syminfo_impl.h>
 
 /*!
  * \brief ATSC BitTimingLoop3
diff --git a/gr-atsc/src/lib/GrAtscConvert2xTo20.h b/gr-atsc/include/atsc/GrAtscConvert2xTo20.h
index 05b1023e58..47ea4fb593 100644
--- a/gr-atsc/src/lib/GrAtscConvert2xTo20.h
+++ b/gr-atsc/include/atsc/GrAtscConvert2xTo20.h
@@ -23,7 +23,7 @@
 #define _GRATSCCONVERT2XTO20_H_
 
 #include <VrDecimatingSigProc.h>
-#include <gr_mmse_fir_interpolator.h>
+#include <filter/mmse_fir_interpolator.h>
 
 class GrAtscConvert2xTo20 : public VrDecimatingSigProc<float,float> {
   gr_mmse_fir_interpolator	d_interp;
diff --git a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h b/gr-atsc/include/atsc/GrAtscDataSegToSoftDataSeg.h
index 207324d557..5fcb894321 100644
--- a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.h
+++ b/gr-atsc/include/atsc/GrAtscDataSegToSoftDataSeg.h
@@ -24,7 +24,7 @@
 #define _GRATSCDATASEGTOSOFTDATASEG_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 /*!
  * \brief Debug glue routine (atsc_data_segment --> atsc_soft_data_segment)
diff --git a/gr-atsc/src/lib/GrAtscDeinterleaver.h b/gr-atsc/include/atsc/GrAtscDeinterleaver.h
index f0f9830b68..8b602fa2dc 100644
--- a/gr-atsc/src/lib/GrAtscDeinterleaver.h
+++ b/gr-atsc/include/atsc/GrAtscDeinterleaver.h
@@ -24,8 +24,8 @@
 #define _GRATSCDEINTERLEAVER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
-#include <atsci_data_interleaver.h>
+#include <atsc/types.h>
+#include <atsc/data_interleaver_impl.h>
 
 /*!
  * \brief Deinterleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/src/lib/GrAtscDerandomizer.h b/gr-atsc/include/atsc/GrAtscDerandomizer.h
index bd0d70d945..0075ae2998 100644
--- a/gr-atsc/src/lib/GrAtscDerandomizer.h
+++ b/gr-atsc/include/atsc/GrAtscDerandomizer.h
@@ -24,8 +24,8 @@
 #define _GRATSCDERANDOMIZER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
-#include <atsci_randomizer.h>
+#include <atsc/types.h>
+#include <atsc/randomizer_impl.h>
 
 /*!
  * \brief Derandomize ATSC data (atsc_mpeg_packet_no_sync --> atsc_mpeg_packet)
diff --git a/gr-atsc/src/lib/GrAtscEqualizer.h b/gr-atsc/include/atsc/GrAtscEqualizer.h
index ff944deb7d..ff944deb7d 100644
--- a/gr-atsc/src/lib/GrAtscEqualizer.h
+++ b/gr-atsc/include/atsc/GrAtscEqualizer.h
diff --git a/gr-atsc/src/lib/GrAtscFPLL.h b/gr-atsc/include/atsc/GrAtscFPLL.h
index 597a4a891b..c1e3302a17 100644
--- a/gr-atsc/src/lib/GrAtscFPLL.h
+++ b/gr-atsc/include/atsc/GrAtscFPLL.h
@@ -24,13 +24,13 @@
 #ifndef _GRATSCFPLL_H_
 #define _GRATSCFPLL_H_
 
-#include <gr_nco.h>
-#include <gr_iir.h>
-#include <gr_single_pole_iir.h>
-#include <gr_agc.h>
+#include <blocks/nco.h>
+#include <filter/iir.h>
+#include <filter/single_pole_iir.h>
+#include <analog/agc.h>
 #include <VrSigProc.h>
 #include <stdio.h>
-#include <atsci_diag_output.h>
+#include <atsc/diag_output_impl.h>
 
 /*!
  * \brief ATSC FPLL (2nd Version)
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncChecker.h b/gr-atsc/include/atsc/GrAtscFieldSyncChecker.h
index 28458a19b5..28458a19b5 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncChecker.h
+++ b/gr-atsc/include/atsc/GrAtscFieldSyncChecker.h
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h b/gr-atsc/include/atsc/GrAtscFieldSyncCorrelator.h
index 1a16048b22..1a16048b22 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.h
+++ b/gr-atsc/include/atsc/GrAtscFieldSyncCorrelator.h
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncDemux.h b/gr-atsc/include/atsc/GrAtscFieldSyncDemux.h
index f5bab9b875..248c257914 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncDemux.h
+++ b/gr-atsc/include/atsc/GrAtscFieldSyncDemux.h
@@ -24,7 +24,7 @@
 #define _GRATSCFIELDSYNCDEMUX_H_
 
 #include <VrDecimatingSigProc.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 /*!
  * \brief ATSC Field Sync Demux
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncMux.h b/gr-atsc/include/atsc/GrAtscFieldSyncMux.h
index ae52b8e5c9..3045f32846 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncMux.h
+++ b/gr-atsc/include/atsc/GrAtscFieldSyncMux.h
@@ -24,7 +24,7 @@
 #define _GRATSCFIELDSYNCMUX_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 /*!
  * \brief Insert ATSC Field Syncs as required (atsc_data_segment --> atsc_data_segment)
diff --git a/gr-atsc/src/lib/GrAtscInterleaver.h b/gr-atsc/include/atsc/GrAtscInterleaver.h
index 76be38a21e..5b6ad4849c 100644
--- a/gr-atsc/src/lib/GrAtscInterleaver.h
+++ b/gr-atsc/include/atsc/GrAtscInterleaver.h
@@ -24,8 +24,8 @@
 #define _GRATSCINTERLEAVER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
-#include <atsci_data_interleaver.h>
+#include <atsc/types.h>
+#include <atsc/data_interleaver_impl.h>
 
 /*!
  * \brief Interleave RS encoded ATSC data ( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/src/lib/GrAtscRSDecoder.h b/gr-atsc/include/atsc/GrAtscRSDecoder.h
index d64102d101..9321b66a5b 100644
--- a/gr-atsc/src/lib/GrAtscRSDecoder.h
+++ b/gr-atsc/include/atsc/GrAtscRSDecoder.h
@@ -24,8 +24,8 @@
 #define _GRATSCRSDECODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
-#include <atsci_reed_solomon.h>
+#include <atsc/types.h>
+#include <atsc/reed_solomon_impl.h>
 
 /*!
  * \brief Pass ATSC data Reed-Solomon decoder( atsc_mpeg_packet_rs_encoded --> atsc_mpeg_rs_no_sync)
diff --git a/gr-atsc/src/lib/GrAtscRSEncoder.h b/gr-atsc/include/atsc/GrAtscRSEncoder.h
index 29921d8b3c..e18b6bd63f 100644
--- a/gr-atsc/src/lib/GrAtscRSEncoder.h
+++ b/gr-atsc/include/atsc/GrAtscRSEncoder.h
@@ -24,8 +24,8 @@
 #define _GRATSCRSENCODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
-#include <atsci_reed_solomon.h>
+#include <atsc/types.h>
+#include <atsc/reed_solomon_impl.h>
 
 /*!
  * \brief Encode using Reed Solomon ATSC data (atsc_mpeg_packet_no_sync --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/src/lib/GrAtscRandomizer.h b/gr-atsc/include/atsc/GrAtscRandomizer.h
index f56f7178e6..565ea7b8eb 100644
--- a/gr-atsc/src/lib/GrAtscRandomizer.h
+++ b/gr-atsc/include/atsc/GrAtscRandomizer.h
@@ -24,8 +24,8 @@
 #define _GRATSCRANDOMIZER_H_
 
 #include <VrHistoryProc.h>
-#include <atsc_types.h>
-#include <atsci_randomizer.h>
+#include <atsc/types.h>
+#include <atsc/randomizer_impl.h>
 
 /*!
  * \brief Randomize ATSC data (atsc_mpeg_packet --> atsc_mpeg_packet_no_sync)
diff --git a/gr-atsc/src/lib/GrAtscSegSymSync.h b/gr-atsc/include/atsc/GrAtscSegSymSync.h
index 750483f544..750483f544 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSync.h
+++ b/gr-atsc/include/atsc/GrAtscSegSymSync.h
diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h b/gr-atsc/include/atsc/GrAtscSegSymSyncImpl.h
index 650dab5690..779f311f4f 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.h
+++ b/gr-atsc/include/atsc/GrAtscSegSymSyncImpl.h
@@ -23,7 +23,7 @@
 #define _GRATSCSEGSYMSYNCIMPL_H_
 
 #include <GrAtscSegSymSync.h>
-#include <atsci_sssr.h>
+#include <atsc/sssr_impl.h>
 
 
 /*!
diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h b/gr-atsc/include/atsc/GrAtscSegSymSyncImpl_export.h
index 187f1a0395..187f1a0395 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl_export.h
+++ b/gr-atsc/include/atsc/GrAtscSegSymSyncImpl_export.h
diff --git a/gr-atsc/src/lib/GrAtscSymbolMapper.h b/gr-atsc/include/atsc/GrAtscSymbolMapper.h
index a37703f1fd..c4e4083aa3 100644
--- a/gr-atsc/src/lib/GrAtscSymbolMapper.h
+++ b/gr-atsc/include/atsc/GrAtscSymbolMapper.h
@@ -25,8 +25,8 @@
 
 
 #include <VrInterpolatingSigProcNoWork.h>
-#include <atsc_types.h>
-#include <gr_nco.h>
+#include <atsc/types.h>
+#include <blocks/nco.h>
 
 /*!
  * \brief take atsc_data_segments and map them to symbols.
diff --git a/gr-atsc/src/lib/GrAtscTrellisEncoder.h b/gr-atsc/include/atsc/GrAtscTrellisEncoder.h
index e4de388ae7..b1a047ce24 100644
--- a/gr-atsc/src/lib/GrAtscTrellisEncoder.h
+++ b/gr-atsc/include/atsc/GrAtscTrellisEncoder.h
@@ -23,7 +23,7 @@
 #ifndef _GRATSCTRELLISENCODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsci_trellis_encoder.h>
+#include <atsc/trellis_encoder_impl.h>
 
 /*!
  * \brief ATSC 12-way interleaved trellis encoder (atsc_mpeg_packet_rs_encoded --> atsc_data_segment)
diff --git a/gr-atsc/src/lib/GrAtscViterbiDecoder.h b/gr-atsc/include/atsc/GrAtscViterbiDecoder.h
index 1b3bdd84a0..35b1ea0dc7 100644
--- a/gr-atsc/src/lib/GrAtscViterbiDecoder.h
+++ b/gr-atsc/include/atsc/GrAtscViterbiDecoder.h
@@ -23,7 +23,7 @@
 #ifndef _GRATSCVITERBIDECODER_H_
 
 #include <VrHistoryProc.h>
-#include <atsci_viterbi_decoder.h>
+#include <atsc/viterbi_decoder_impl.h>
 
 /*!
  * \brief ATSC 12-way interleaved viterbi decoder (atsc_soft_data_segment --> atsc_mpeg_packet_rs_encoded)
diff --git a/gr-atsc/src/lib/atsc_api.h b/gr-atsc/include/atsc/api.h
index 5add37762b..5add37762b 100644
--- a/gr-atsc/src/lib/atsc_api.h
+++ b/gr-atsc/include/atsc/api.h
diff --git a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h b/gr-atsc/include/atsc/basic_trellis_encoder_impl.h
index a1bbbf5a0e..396ca94957 100644
--- a/gr-atsc/src/lib/atsci_basic_trellis_encoder.h
+++ b/gr-atsc/include/atsc/basic_trellis_encoder_impl.h
@@ -19,10 +19,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef _ATSC_BASIC_TRELLIS_ENCODER_H_
 #define _ATSC_BASIC_TRELLIS_ENCODER_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <assert.h>
 
 /*!
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.h b/gr-atsc/include/atsc/bit_timing_loop.h
index 8b352f7eb1..eee2b2f73b 100644
--- a/gr-atsc/src/lib/atsc_bit_timing_loop.h
+++ b/gr-atsc/include/atsc/bit_timing_loop.h
@@ -19,15 +19,16 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_BIT_TIMING_LOOP_H
 #define INCLUDED_ATSC_BIT_TIMING_LOOP_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <cstdio>
 #include <gr_block.h>
-#include <atsci_diag_output.h>
-#include <atsci_sssr.h>
-#include <atsci_syminfo.h>
+#include <atsc/diag_output_impl.h>
+#include <atsc/sssr_impl.h>
+#include <atsc/syminfo_impl.h>
 
 class atsc_bit_timing_loop;
 typedef boost::shared_ptr<atsc_bit_timing_loop> atsc_bit_timing_loop_sptr;
diff --git a/gr-atsc/src/lib/atsc_consts.h b/gr-atsc/include/atsc/consts.h
index bbe2ec69aa..bbe2ec69aa 100644
--- a/gr-atsc/src/lib/atsc_consts.h
+++ b/gr-atsc/include/atsc/consts.h
diff --git a/gr-atsc/src/lib/convolutional_interleaver.h b/gr-atsc/include/atsc/convolutional_interleaver.h
index 35a31d4879..00c843b015 100644
--- a/gr-atsc/src/lib/convolutional_interleaver.h
+++ b/gr-atsc/include/atsc/convolutional_interleaver.h
@@ -24,7 +24,7 @@
 #define _CONVOLUTIONAL_INTERLEAVER_H_
 
 #include <vector>
-#include <interleaver_fifo.h>
+#include <atsc/interleaver_fifo.h>
 #include <assert.h>
 
 /*!
diff --git a/gr-atsc/src/lib/create_atsci_equalizer.h b/gr-atsc/include/atsc/create_atsci_equalizer.h
index b291e0bbdf..adc4991703 100644
--- a/gr-atsc/src/lib/create_atsci_equalizer.h
+++ b/gr-atsc/include/atsc/create_atsci_equalizer.h
@@ -19,10 +19,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef _CREATE_ATSC_EQUALIZER_H_
 #define _CREATE_ATSC_EQUALIZER_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 
 class atsci_equalizer;
 
diff --git a/gr-atsc/src/lib/create_atsci_fs_checker.h b/gr-atsc/include/atsc/create_atsci_fs_checker.h
index 42119a6d49..5d8e9ea407 100644
--- a/gr-atsc/src/lib/create_atsci_fs_checker.h
+++ b/gr-atsc/include/atsc/create_atsci_fs_checker.h
@@ -23,7 +23,7 @@
 #ifndef _CREATE_ATSC_FS_CHECKER_H_
 #define _CREATE_ATSC_FS_CHECKER_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 
 class atsci_fs_checker;
 
diff --git a/gr-atsc/src/lib/create_atsci_fs_correlator.h b/gr-atsc/include/atsc/create_atsci_fs_correlator.h
index b9b037403a..0488645ace 100644
--- a/gr-atsc/src/lib/create_atsci_fs_correlator.h
+++ b/gr-atsc/include/atsc/create_atsci_fs_correlator.h
@@ -23,7 +23,7 @@
 #ifndef _CREATE_ATSC_FS_CORRELATOR_H_
 #define _CREATE_ATSC_FS_CORRELATOR_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 
 class atsci_fs_correlator;
 
diff --git a/gr-atsc/src/lib/atsci_data_interleaver.h b/gr-atsc/include/atsc/data_interleaver_impl.h
index 290607ea3d..a7765bd43f 100644
--- a/gr-atsc/src/lib/atsci_data_interleaver.h
+++ b/gr-atsc/include/atsc/data_interleaver_impl.h
@@ -23,9 +23,9 @@
 #ifndef _ATSC_DATA_INTERLEAVER_H_
 #define _ATSC_DATA_INTERLEAVER_H_
 
-#include <atsc_api.h>
-#include <atsc_types.h>
-#include <convolutional_interleaver.h>
+#include <atsc/api.h>
+#include <atsc/types.h>
+#include <atsc/convolutional_interleaver.h>
 
 /*!
  * \brief atsc convolutional data interleaver
diff --git a/gr-atsc/src/lib/atsc_deinterleaver.h b/gr-atsc/include/atsc/deinterleaver.h
index e398dfcc7d..7864526cfd 100644
--- a/gr-atsc/src/lib/atsc_deinterleaver.h
+++ b/gr-atsc/include/atsc/deinterleaver.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_DEINTERLEAVER_H
 #define INCLUDED_ATSC_DEINTERLEAVER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_data_interleaver.h>
+#include <atsc/data_interleaver_impl.h>
 
 class atsc_deinterleaver;
 typedef boost::shared_ptr<atsc_deinterleaver> atsc_deinterleaver_sptr;
diff --git a/gr-atsc/src/lib/atsc_depad.h b/gr-atsc/include/atsc/depad.h
index 9d1a381bfd..ffced87a39 100644
--- a/gr-atsc/src/lib/atsc_depad.h
+++ b/gr-atsc/include/atsc/depad.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_ATSC_DEPAD_H
 #define INCLUDED_ATSC_DEPAD_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_interpolator.h>
 
 class atsc_depad;
diff --git a/gr-atsc/src/lib/atsc_derandomizer.h b/gr-atsc/include/atsc/derandomizer.h
index 1881a69a36..4def872aa6 100644
--- a/gr-atsc/src/lib/atsc_derandomizer.h
+++ b/gr-atsc/include/atsc/derandomizer.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_ATSC_DERANDOMIZER_H
 #define INCLUDED_ATSC_DERANDOMIZER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_randomizer.h>
+#include <atsc/randomizer_impl.h>
 
 class atsc_derandomizer;
 typedef boost::shared_ptr<atsc_derandomizer> atsc_derandomizer_sptr;
diff --git a/gr-atsc/src/lib/atsci_diag_output.h b/gr-atsc/include/atsc/diag_output_impl.h
index 09fd763d6a..09fd763d6a 100644
--- a/gr-atsc/src/lib/atsci_diag_output.h
+++ b/gr-atsc/include/atsc/diag_output_impl.h
diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.h b/gr-atsc/include/atsc/ds_to_softds.h
index 0ba61c7d6b..6356506663 100644
--- a/gr-atsc/src/lib/atsc_ds_to_softds.h
+++ b/gr-atsc/include/atsc/ds_to_softds.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_DS_TO_SOFTDS_H
 #define INCLUDED_ATSC_DS_TO_SOFTDS_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 class atsc_ds_to_softds;
 typedef boost::shared_ptr<atsc_ds_to_softds> atsc_ds_to_softds_sptr;
diff --git a/gr-atsc/src/lib/atsc_equalizer.h b/gr-atsc/include/atsc/equalizer.h
index aca5e63b49..a910ab7562 100644
--- a/gr-atsc/src/lib/atsc_equalizer.h
+++ b/gr-atsc/include/atsc/equalizer.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_EQUALIZER_H
 #define INCLUDED_ATSC_EQUALIZER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_equalizer.h>
+#include <atsc/equalizer_impl.h>
 #include <vector>
 
 class atsc_equalizer;
diff --git a/gr-atsc/src/lib/atsci_equalizer.h b/gr-atsc/include/atsc/equalizer_impl.h
index b0c243b51a..e2baf537df 100644
--- a/gr-atsc/src/lib/atsci_equalizer.h
+++ b/gr-atsc/include/atsc/equalizer_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_H_
 #define _ATSC_EQUALIZER_H_
 
-#include <atsc_api.h>
-#include <atsci_syminfo.h>
+#include <atsc/api.h>
+#include <atsc/syminfo_impl.h>
 #include <vector>
 
 /*!
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.h b/gr-atsc/include/atsc/equalizer_lms2_impl.h
index d0f2660d5b..ebd6c13d0f 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.h
+++ b/gr-atsc/include/atsc/equalizer_lms2_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_LMS2_H_
 #define _ATSC_EQUALIZER_LMS2_H_
 
-#include <atsc_api.h>
-#include <atsci_equalizer.h>
+#include <atsc/api.h>
+#include <atsc/equalizer_impl.h>
 #include <vector>
 #include <stdio.h>
 
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.h b/gr-atsc/include/atsc/equalizer_lms_impl.h
index eac72f75b4..c91349de69 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms.h
+++ b/gr-atsc/include/atsc/equalizer_lms_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_LMS_H_
 #define _ATSC_EQUALIZER_LMS_H_
 
-#include <atsc_api.h>
-#include <atsci_equalizer.h>
+#include <atsc/api.h>
+#include <atsc/equalizer_impl.h>
 #include <vector>
 #include <stdio.h>
 
diff --git a/gr-atsc/src/lib/atsci_equalizer_nop.h b/gr-atsc/include/atsc/equalizer_nop_impl.h
index d29fded640..85549e326b 100644
--- a/gr-atsc/src/lib/atsci_equalizer_nop.h
+++ b/gr-atsc/include/atsc/equalizer_nop_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_EQUALIZER_NOP_H_
 #define _ATSC_EQUALIZER_NOP_H_
 
-#include <atsc_api.h>
-#include <atsci_equalizer.h>
+#include <atsc/api.h>
+#include <atsc/equalizer_impl.h>
 
 class ATSC_API atsci_equalizer_nop : public atsci_equalizer
 {
diff --git a/gr-atsc/src/lib/atsci_exp2_lp.h b/gr-atsc/include/atsc/exp2_lp_impl.h
index e04c425287..b0fbc46432 100644
--- a/gr-atsc/src/lib/atsci_exp2_lp.h
+++ b/gr-atsc/include/atsc/exp2_lp_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_EXP2_LP_H_
 #define _ATSC_EXP2_LP_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_fir_builder.h>
 
 class ATSC_API atsci_exp2_lp : public gr_fir_builder
diff --git a/gr-atsc/src/lib/atsci_fake_single_viterbi.h b/gr-atsc/include/atsc/fake_single_viterbi_impl.h
index 561afb3d37..5895e0ac61 100644
--- a/gr-atsc/src/lib/atsci_fake_single_viterbi.h
+++ b/gr-atsc/include/atsc/fake_single_viterbi_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSCFAKESINGLEVITERBI_H_
 #define _ATSCFAKESINGLEVITERBI_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 
 /*!
  * \brief single channel viterbi decoder
diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.h b/gr-atsc/include/atsc/field_sync_demux.h
index ea9a5d1acd..bec3590096 100644
--- a/gr-atsc/src/lib/atsc_field_sync_demux.h
+++ b/gr-atsc/include/atsc/field_sync_demux.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
 #define INCLUDED_ATSC_FIELD_SYNC_DEMUX_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_block.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 class atsc_field_sync_demux;
 typedef boost::shared_ptr<atsc_field_sync_demux> atsc_field_sync_demux_sptr;
diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.h b/gr-atsc/include/atsc/field_sync_mux.h
index ce4514e9c3..21a2f0fdab 100644
--- a/gr-atsc/src/lib/atsc_field_sync_mux.h
+++ b/gr-atsc/include/atsc/field_sync_mux.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_FIELD_SYNC_MUX_H
 #define INCLUDED_ATSC_FIELD_SYNC_MUX_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 class atsc_field_sync_mux;
 typedef boost::shared_ptr<atsc_field_sync_mux> atsc_field_sync_mux_sptr;
diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/include/atsc/fpll.h
index 0474b8f766..00d6b1e54e 100644
--- a/gr-atsc/src/lib/atsc_fpll.h
+++ b/gr-atsc/include/atsc/fpll.h
@@ -19,16 +19,19 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_FPLL_H
 #define INCLUDED_ATSC_FPLL_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <gr_nco.h>
-#include <gr_single_pole_iir.h>
-#include <gri_agc_ff.h>
+#include <blocks/nco.h>
+#include <filter/single_pole_iir.h>
+#include <analog/agc.h>
 #include <stdio.h>
-#include <atsci_diag_output.h>
+#include <atsc/diag_output_impl.h>
+
+using namespace gr;
 
 class atsc_fpll;
 typedef boost::shared_ptr<atsc_fpll> atsc_fpll_sptr;
@@ -67,10 +70,10 @@ public:
   double                        initial_freq;
   double                        initial_phase;
   bool                          debug_no_update;
-  gr_nco<float,float>           nco;
-  gri_agc_ff                    agc;    // automatic gain control
-  gr_single_pole_iir<float,float,float> afci;
-  gr_single_pole_iir<float,float,float> afcq;
+  blocks::nco<float,float>      nco;
+  analog::kernel::agc_ff        agc;    // automatic gain control
+  filter::single_pole_iir<float,float,float> afci;
+  filter::single_pole_iir<float,float,float> afcq;
 
 
 };
diff --git a/gr-atsc/src/lib/atsc_fs_checker.h b/gr-atsc/include/atsc/fs_checker.h
index d034fdd28f..1bd304090f 100644
--- a/gr-atsc/src/lib/atsc_fs_checker.h
+++ b/gr-atsc/include/atsc/fs_checker.h
@@ -19,11 +19,12 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_FS_CHECKER_H
 #define INCLUDED_ATSC_FS_CHECKER_H
 
-#include <atsc_api.h>
-#include <atsci_fs_checker.h>
+#include <atsc/api.h>
+#include <atsc/fs_checker_impl.h>
 #include <gr_sync_block.h>
 
 class atsc_fs_checker;
diff --git a/gr-atsc/src/lib/atsci_fs_checker.h b/gr-atsc/include/atsc/fs_checker_impl.h
index 7a426b742f..a4975d243e 100644
--- a/gr-atsc/src/lib/atsci_fs_checker.h
+++ b/gr-atsc/include/atsc/fs_checker_impl.h
@@ -22,8 +22,8 @@
 #ifndef _ATSC_FS_CHECKER_H_
 #define _ATSC_FS_CHECKER_H_
 
-#include <atsc_api.h>
-#include <atsci_syminfo.h>
+#include <atsc/api.h>
+#include <atsc/syminfo_impl.h>
 
 /*!
  * \brief abstract base class for ATSC field sync checker
diff --git a/gr-atsc/src/lib/atsci_fs_checker_naive.h b/gr-atsc/include/atsc/fs_checker_naive_impl.h
index 21c628a1d2..0056bf69c8 100644
--- a/gr-atsc/src/lib/atsci_fs_checker_naive.h
+++ b/gr-atsc/include/atsc/fs_checker_naive_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_FS_CHECKER_NAIVE_H_
 #define _ATSC_FS_CHECKER_NAIVE_H_
 
-#include <atsc_api.h>
-#include <atsci_fs_checker.h>
+#include <atsc/api.h>
+#include <atsc/fs_checker_impl.h>
 
 /*!
  * \brief Naive concrete implementation of field sync checker
diff --git a/gr-atsc/src/lib/atsci_fs_correlator.h b/gr-atsc/include/atsc/fs_correlator_impl.h
index ff70245c99..b55b1b9854 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator.h
+++ b/gr-atsc/include/atsc/fs_correlator_impl.h
@@ -19,10 +19,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef _ATSC_FS_CORRELATOR_H_
 #define _ATSC_FS_CORRELATOR_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 
 /*!
  * \brief abstract base class for ATSC field sync correlator
diff --git a/gr-atsc/src/lib/atsci_fs_correlator_naive.h b/gr-atsc/include/atsc/fs_correlator_naive_impl.h
index d8afc2ca62..e2fd19557b 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator_naive.h
+++ b/gr-atsc/include/atsc/fs_correlator_naive_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_FS_CORRELATOR_NAIVE_H_
 #define _ATSC_FS_CORRELATOR_NAIVE_H_
 
-#include <atsc_api.h>
-#include <atsci_fs_correlator.h>
+#include <atsc/api.h>
+#include <atsc/fs_correlator_impl.h>
 
 /*!
  * \brief Naive concrete implementation of field sync correlator
diff --git a/gr-atsc/src/lib/atsc_interleaver.h b/gr-atsc/include/atsc/interleaver.h
index 3090d49de4..f426381add 100644
--- a/gr-atsc/src/lib/atsc_interleaver.h
+++ b/gr-atsc/include/atsc/interleaver.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_INTERLEAVER_H
 #define INCLUDED_ATSC_INTERLEAVER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_data_interleaver.h>
+#include <atsc/data_interleaver_impl.h>
 
 class atsc_interleaver;
 typedef boost::shared_ptr<atsc_interleaver> atsc_interleaver_sptr;
diff --git a/gr-atsc/src/lib/interleaver_fifo.h b/gr-atsc/include/atsc/interleaver_fifo.h
index cacac85a39..5c29a82563 100644
--- a/gr-atsc/src/lib/interleaver_fifo.h
+++ b/gr-atsc/include/atsc/interleaver_fifo.h
@@ -24,7 +24,7 @@
 #define _INTERLEAVER_FIFO_H_
 
 
-#include <interleaver_fifo.h>
+#include <atsc/interleaver_fifo.h>
 #include <string.h>
 
 /*!
diff --git a/gr-atsc/src/lib/atsc_pad.h b/gr-atsc/include/atsc/pad.h
index 139d951a6c..b48d17f7b7 100644
--- a/gr-atsc/src/lib/atsc_pad.h
+++ b/gr-atsc/include/atsc/pad.h
@@ -19,10 +19,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_PAD_H
 #define INCLUDED_ATSC_PAD_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_decimator.h>
 
 class atsc_pad;
diff --git a/gr-atsc/src/lib/atsci_pnXXX.h b/gr-atsc/include/atsc/pnXXX_impl.h
index 612ed20341..3de6eb1f51 100644
--- a/gr-atsc/src/lib/atsci_pnXXX.h
+++ b/gr-atsc/include/atsc/pnXXX_impl.h
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 
 ATSC_API extern const unsigned char atsc_pn511[];
 ATSC_API extern const unsigned char atsc_pn63[];
diff --git a/gr-atsc/src/lib/atsc_randomizer.h b/gr-atsc/include/atsc/randomizer.h
index 7d00efcf90..8825062bbc 100644
--- a/gr-atsc/src/lib/atsc_randomizer.h
+++ b/gr-atsc/include/atsc/randomizer.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_RANDOMIZER_H
 #define INCLUDED_ATSC_RANDOMIZER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_randomizer.h>
+#include <atsc/randomizer_impl.h>
 
 class atsc_randomizer;
 typedef boost::shared_ptr<atsc_randomizer> atsc_randomizer_sptr;
diff --git a/gr-atsc/src/lib/atsci_randomizer.h b/gr-atsc/include/atsc/randomizer_impl.h
index aedd0d8081..4fdbebc06d 100644
--- a/gr-atsc/src/lib/atsci_randomizer.h
+++ b/gr-atsc/include/atsc/randomizer_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_RANDOMIZER_H_
 #define _ATSC_RANDOMIZER_H_
 
-#include <atsc_api.h>
-#include <atsc_types.h>
+#include <atsc/api.h>
+#include <atsc/types.h>
 
 /*!
  * \brief ATSC data "whitener"
diff --git a/gr-atsc/src/lib/atsci_reed_solomon.h b/gr-atsc/include/atsc/reed_solomon_impl.h
index 8f6e26426b..484b6d0ce2 100644
--- a/gr-atsc/src/lib/atsci_reed_solomon.h
+++ b/gr-atsc/include/atsc/reed_solomon_impl.h
@@ -23,8 +23,8 @@
 #ifndef _ATSC_REED_SOLOMON_H_
 #define _ATSC_REED_SOLOMON_H_
 
-#include <atsc_api.h>
-#include <atsc_types.h>
+#include <atsc/api.h>
+#include <atsc/types.h>
 
 /*!
  * \brief ATSC Reed-Solomon encoder / decoder
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h b/gr-atsc/include/atsc/root_raised_cosine_bandpass_impl.h
index bdb33c28d2..50548bec89 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.h
+++ b/gr-atsc/include/atsc/root_raised_cosine_bandpass_impl.h
@@ -19,11 +19,12 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef _ATSC_RRC_BANDPASS_H_
 #define _ATSC_RRC_BANDPASS_H_
 
-#include <atsc_api.h>
-#include <atsci_root_raised_cosine.h>
+#include <atsc/api.h>
+#include <atsc/root_raised_cosine_impl.h>
 
 class ATSC_API atsc_root_raised_cosine_bandpass : public atsc_root_raised_cosine
 {
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.h b/gr-atsc/include/atsc/root_raised_cosine_impl.h
index f24606992c..ae884bfb19 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine.h
+++ b/gr-atsc/include/atsc/root_raised_cosine_impl.h
@@ -19,10 +19,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef _ATSC_RRC_H_
 #define _ATSC_RRC_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_fir_builder.h>
 
 class ATSC_API atsc_root_raised_cosine : public gr_fir_builder
diff --git a/gr-atsc/src/lib/atsc_rs_decoder.h b/gr-atsc/include/atsc/rs_decoder.h
index 9e4bf8d44e..308fb46432 100644
--- a/gr-atsc/src/lib/atsc_rs_decoder.h
+++ b/gr-atsc/include/atsc/rs_decoder.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_RS_DECODER_H
 #define INCLUDED_ATSC_RS_DECODER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_reed_solomon.h>
+#include <atsc/reed_solomon_impl.h>
 
 class atsc_rs_decoder;
 typedef boost::shared_ptr<atsc_rs_decoder> atsc_rs_decoder_sptr;
diff --git a/gr-atsc/src/lib/atsc_rs_encoder.h b/gr-atsc/include/atsc/rs_encoder.h
index b0d69d95d2..ace2806da3 100644
--- a/gr-atsc/src/lib/atsc_rs_encoder.h
+++ b/gr-atsc/include/atsc/rs_encoder.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_RS_ENCODER_H
 #define INCLUDED_ATSC_RS_ENCODER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_reed_solomon.h>
+#include <atsc/reed_solomon_impl.h>
 
 class atsc_rs_encoder;
 typedef boost::shared_ptr<atsc_rs_encoder> atsc_rs_encoder_sptr;
diff --git a/gr-atsc/src/lib/atsci_single_viterbi.h b/gr-atsc/include/atsc/single_viterbi_impl.h
index 01b13fb25e..d92ded80e5 100644
--- a/gr-atsc/src/lib/atsci_single_viterbi.h
+++ b/gr-atsc/include/atsc/single_viterbi_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSCSINGLEVITERBI_H_
 #define _ATSCSINGLEVITERBI_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 
 /*!
  * \brief single channel viterbi decoder
diff --git a/gr-atsc/src/lib/atsci_slicer_agc.h b/gr-atsc/include/atsc/slicer_agc_impl.h
index 8a3927b70a..91694c09db 100644
--- a/gr-atsc/src/lib/atsci_slicer_agc.h
+++ b/gr-atsc/include/atsc/slicer_agc_impl.h
@@ -23,9 +23,9 @@
 #ifndef _ATSC_SLICER_AGC_H_
 #define _ATSC_SLICER_AGC_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <math.h>
-#include <gr_single_pole_iir.h>
+#include <filter/single_pole_iir.h>
 
 /*!
  * \brief Automatic Gain Control class for atsc slicer
diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.h b/gr-atsc/include/atsc/sliding_correlator_impl.h
index ffa2124ed3..45c0caa241 100644
--- a/gr-atsc/src/lib/atsci_sliding_correlator.h
+++ b/gr-atsc/include/atsc/sliding_correlator_impl.h
@@ -19,13 +19,14 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef _ATSC_SLIDING_CORRELATOR_H_
 #define _ATSC_SLIDING_CORRELATOR_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <string.h>
 
-#include <atsci_pnXXX.h>
+#include <atsc/pnXXX_impl.h>
 //extern const unsigned char atsc_pn511[511];
 //extern const unsigned char atsc_pn63[63];
 
diff --git a/gr-atsc/src/lib/atsci_sssr.h b/gr-atsc/include/atsc/sssr_impl.h
index f3b825b3c4..60d116577b 100644
--- a/gr-atsc/src/lib/atsci_sssr.h
+++ b/gr-atsc/include/atsc/sssr_impl.h
@@ -27,10 +27,10 @@
 #ifndef _ATSC_SSSR_H_
 #define _ATSC_SSSR_H_
 
-#include <atsc_api.h>
-#include <atsc_consts.h>
-#include <gri_mmse_fir_interpolator.h>
-#include <gr_single_pole_iir.h>
+#include <atsc/api.h>
+#include <atsc/consts.h>
+#include <filter/mmse_fir_interpolator_ff.h>
+#include <filter/single_pole_iir.h>
 #include <cstdio>
 
 /*
@@ -195,8 +195,8 @@ public:
  */
 
 class ATSC_API atsci_interpolator {
-  gri_mmse_fir_interpolator	d_interp;
-  gr_single_pole_iir<float,float,float> d_loop;	// ``VCO'' loop filter
+  gr::filter::mmse_fir_interpolator_ff d_interp;
+  gr::filter::single_pole_iir<float,float,float> d_loop; // ``VCO'' loop filter
   double			d_nominal_ratio_of_rx_clock_to_symbol_freq; // FREQ
   double			d_w;	// ratio of PERIOD of Tx to Rx clocks
   double			d_mu;	// fractional delay [0,1]
diff --git a/gr-atsc/src/lib/atsci_syminfo.h b/gr-atsc/include/atsc/syminfo_impl.h
index 9f25e4902a..9f25e4902a 100644
--- a/gr-atsc/src/lib/atsci_syminfo.h
+++ b/gr-atsc/include/atsc/syminfo_impl.h
diff --git a/gr-atsc/src/lib/atsci_sync_tag.h b/gr-atsc/include/atsc/sync_tag_impl.h
index bdb64c5d3d..bdb64c5d3d 100644
--- a/gr-atsc/src/lib/atsci_sync_tag.h
+++ b/gr-atsc/include/atsc/sync_tag_impl.h
diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.h b/gr-atsc/include/atsc/trellis_encoder.h
index da51f633d2..243dd7c2ce 100644
--- a/gr-atsc/src/lib/atsc_trellis_encoder.h
+++ b/gr-atsc/include/atsc/trellis_encoder.h
@@ -22,9 +22,9 @@
 #ifndef INCLUDED_ATSC_TRELLIS_ENCODER_H
 #define INCLUDED_ATSC_TRELLIS_ENCODER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_trellis_encoder.h>
+#include <atsc/trellis_encoder_impl.h>
 
 class atsc_trellis_encoder;
 typedef boost::shared_ptr<atsc_trellis_encoder> atsc_trellis_encoder_sptr;
diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.h b/gr-atsc/include/atsc/trellis_encoder_impl.h
index 294ad860ff..d20885ef36 100644
--- a/gr-atsc/src/lib/atsci_trellis_encoder.h
+++ b/gr-atsc/include/atsc/trellis_encoder_impl.h
@@ -23,9 +23,9 @@
 #ifndef _ATSC_TRELLIS_ENCODER_H_
 #define _ATSC_TRELLIS_ENCODER_H_
 
-#include <atsc_api.h>
-#include <atsci_basic_trellis_encoder.h>
-#include <atsc_types.h>
+#include <atsc/api.h>
+#include <atsc/basic_trellis_encoder_impl.h>
+#include <atsc/types.h>
 
 /*!
  * \brief fancy, schmancy 12-way interleaved trellis encoder for ATSC
diff --git a/gr-atsc/src/lib/atsc_types.h b/gr-atsc/include/atsc/types.h
index ed4dedace9..759ef68ba7 100644
--- a/gr-atsc/src/lib/atsc_types.h
+++ b/gr-atsc/include/atsc/types.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_TYPES_H_
 #define _ATSC_TYPES_H_
 
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 #include <cstring>
 #include <cassert>
 
diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.h b/gr-atsc/include/atsc/viterbi_decoder.h
index de571db33d..e119337553 100644
--- a/gr-atsc/src/lib/atsc_viterbi_decoder.h
+++ b/gr-atsc/include/atsc/viterbi_decoder.h
@@ -19,12 +19,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street,
  * Boston, MA 02110-1301, USA.
  */
+
 #ifndef INCLUDED_ATSC_VITERBI_DECODER_H
 #define INCLUDED_ATSC_VITERBI_DECODER_H
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_sync_block.h>
-#include <atsci_viterbi_decoder.h>
+#include <atsc/viterbi_decoder_impl.h>
 
 class atsc_viterbi_decoder;
 typedef boost::shared_ptr<atsc_viterbi_decoder> atsc_viterbi_decoder_sptr;
diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.h b/gr-atsc/include/atsc/viterbi_decoder_impl.h
index f339ce79a1..307b157a9b 100644
--- a/gr-atsc/src/lib/atsci_viterbi_decoder.h
+++ b/gr-atsc/include/atsc/viterbi_decoder_impl.h
@@ -25,15 +25,15 @@
 
 #define	USE_SIMPLE_SLICER  0
 
-#include <atsc_api.h>
-#include <atsc_types.h>
-#include <interleaver_fifo.h>
+#include <atsc/api.h>
+#include <atsc/types.h>
+#include <atsc/interleaver_fifo.h>
 
 #if (USE_SIMPLE_SLICER)
-#include <atsci_fake_single_viterbi.h>
+#include <atsc/fake_single_viterbi_impl.h>
 typedef atsci_fake_single_viterbi	single_viterbi_t;
 #else
-#include <atsci_single_viterbi.h>
+#include <atsc/single_viterbi_impl.h>
 typedef atsci_single_viterbi		single_viterbi_t;
 #endif
 
diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.h b/gr-atsc/include/atsc/vsbtx_lp_impl.h
index b892641c9d..d9640ca483 100644
--- a/gr-atsc/src/lib/atsci_vsbtx_lp.h
+++ b/gr-atsc/include/atsc/vsbtx_lp_impl.h
@@ -23,7 +23,7 @@
 #ifndef _ATSC_VSBTX_LP_H_
 #define _ATSC_VSBTX_LP_H_
 
-#include <atsc_api.h>
+#include <atsc/api.h>
 #include <gr_fir_builder.h>
 
 class ATSC_API atsc_vsbtx_lp : public gr_fir_builder
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/lib/CMakeLists.txt
index 86c0be4430..b30581be79 100644
--- a/gr-atsc/src/lib/CMakeLists.txt
+++ b/gr-atsc/lib/CMakeLists.txt
@@ -21,16 +21,20 @@
 # Setup the include and linker paths
 ########################################################################
 include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GR_ATSC_INCLUDE_DIRS}
+    ${GR_FILTER_INCLUDE_DIRS}
+    ${GR_ANALOG_INCLUDE_DIRS}
+    ${GR_FEC_INCLUDE_DIRS}
+    ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_CORE_INCLUDE_DIRS}
     ${GRUEL_INCLUDE_DIRS}
+    ${LOG4CPP_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 link_directories(${Boost_LIBRARY_DIRS})
-
-include_directories(${LOG4CPP_INCLUDE_DIRS})
 link_directories(${LOG4CPP_LIBRARY_DIRS})
 
 ########################################################################
@@ -113,7 +117,11 @@ IF(MSVC)
 ENDIF(MSVC)
 
 list(APPEND atsc_libs
+    gnuradio-filter
+    gnuradio-analog
     gnuradio-core
+    gnuradio-fec
+    gnuradio-blocks
     ${Boost_LIBRARIES}
     ${LOG4CPP_LIBRARIES}
 )
@@ -148,107 +156,9 @@ list(APPEND test_atsci_sources
 )
 
 include(GrTest)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft)
 add_executable(test_atsci ${test_atsci_sources} test_atsci.cc)
 target_link_libraries(test_atsci gnuradio-atsc gnuradio-core ${CPPUNIT_LIBRARIES})
 GR_ADD_TEST(atsci-test test_atsci)
 
 endif(ENABLE_TESTING)
-
-########################################################################
-# Install public header files
-########################################################################
-install(FILES
-    atsc_api.h
-    atsc_consts.h
-    atsc_derandomizer.h
-    atsc_randomizer.h
-    atsc_rs_decoder.h
-    atsc_rs_encoder.h
-    atsc_interleaver.h
-    atsc_deinterleaver.h
-    atsc_trellis_encoder.h
-    atsc_viterbi_decoder.h
-    atsc_ds_to_softds.h
-    atsc_field_sync_mux.h
-    atsc_field_sync_demux.h
-    atsc_equalizer.h
-    atsc_fs_checker.h
-    atsc_bit_timing_loop.h
-    atsc_fpll.h
-    atsc_depad.h
-    atsc_pad.h
-    atsc_types.h
-    atsci_basic_trellis_encoder.h
-    atsci_data_interleaver.h
-    atsci_diag_output.h
-    atsci_equalizer.h
-    atsci_equalizer_lms.h
-    atsci_equalizer_lms2.h
-    atsci_equalizer_nop.h
-    atsci_exp2_lp.h
-    atsci_fake_single_viterbi.h
-    atsci_fs_checker.h
-    atsci_fs_checker_naive.h
-    atsci_fs_correlator.h
-    atsci_fs_correlator_naive.h
-    atsci_pnXXX.h
-    atsci_randomizer.h
-    atsci_reed_solomon.h
-    atsci_root_raised_cosine.h
-    atsci_root_raised_cosine_bandpass.h
-    atsci_single_viterbi.h
-    atsci_slicer_agc.h
-    atsci_sliding_correlator.h
-    atsci_sssr.h
-    atsci_syminfo.h
-    atsci_sync_tag.h
-    atsci_trellis_encoder.h
-    atsci_viterbi_decoder.h
-    atsci_vsbtx_lp.h
-    convolutional_interleaver.h
-    create_atsci_equalizer.h
-    create_atsci_fs_checker.h
-    create_atsci_fs_correlator.h
-    fpll_btloop_coupling.h
-    interleaver_fifo.h
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio
-    COMPONENT "atsc_devel"
-)
-
-########################################################################
-# Setup swig generation
-########################################################################
-if(ENABLE_PYTHON)
-include(GrPython)
-include(GrSwig)
-
-set(GR_SWIG_INCLUDE_DIRS
-    ${GR_ATSC_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
-    ${Boost_INCLUDE_DIRS}
-)
-
-# add Doxygen docs to python
-set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
-
-set(GR_SWIG_LIBRARIES gnuradio-atsc)
-
-GR_SWIG_MAKE(atsc atsc.i)
-
-GR_SWIG_INSTALL(
-    TARGETS atsc
-    DESTINATION ${GR_PYTHON_DIR}/gnuradio
-    COMPONENT "atsc_python"
-)
-
-install(
-    FILES atsc.i
-    ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
-    COMPONENT "atsc_swig"
-)
-
-endif(ENABLE_PYTHON)
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop.cc b/gr-atsc/lib/GrAtscBitTimingLoop.cc
index 8053736ee9..f2e666892b 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop.cc
+++ b/gr-atsc/lib/GrAtscBitTimingLoop.cc
@@ -21,10 +21,10 @@
  */
 
 #include <cmath>
-#include <GrAtscBitTimingLoop.h>
+#include <atsc/GrAtscBitTimingLoop.h>
 #include "fpll_btloop_coupling.h"
 #include <algorithm>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc b/gr-atsc/lib/GrAtscBitTimingLoop2.cc
index c741a5bb20..d856123fc3 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop2.cc
+++ b/gr-atsc/lib/GrAtscBitTimingLoop2.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscBitTimingLoop2.h>
+#include <atsc/GrAtscBitTimingLoop2.h>
 #include <algorithm>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc b/gr-atsc/lib/GrAtscBitTimingLoop3.cc
index f9c1eb02e2..647b34c151 100644
--- a/gr-atsc/src/lib/GrAtscBitTimingLoop3.cc
+++ b/gr-atsc/lib/GrAtscBitTimingLoop3.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscBitTimingLoop3.h>
+#include <atsc/GrAtscBitTimingLoop3.h>
 #include <cmath>
 #include <cstdio>
 #include <assert.h>
diff --git a/gr-atsc/src/lib/GrAtscConvert2xTo20.cc b/gr-atsc/lib/GrAtscConvert2xTo20.cc
index 1f540464dc..ac22ee1258 100644
--- a/gr-atsc/src/lib/GrAtscConvert2xTo20.cc
+++ b/gr-atsc/lib/GrAtscConvert2xTo20.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscConvert2xTo20.h>
-#include <atsc_consts.h>
+#include <atsc/GrAtscConvert2xTo20.h>
+#include <atsc/consts.h>
 #include <cmath>
 #include <cstdio>
 
diff --git a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc b/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc
index 09c3db4e0c..2406c0c33d 100644
--- a/gr-atsc/src/lib/GrAtscDataSegToSoftDataSeg.cc
+++ b/gr-atsc/lib/GrAtscDataSegToSoftDataSeg.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscDataSegToSoftDataSeg.h>
+#include <atsc/GrAtscDataSegToSoftDataSeg.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscDeinterleaver.cc b/gr-atsc/lib/GrAtscDeinterleaver.cc
index fd67d7a205..69fac69aa8 100644
--- a/gr-atsc/src/lib/GrAtscDeinterleaver.cc
+++ b/gr-atsc/lib/GrAtscDeinterleaver.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscDeinterleaver.h>
+#include <atsc/GrAtscDeinterleaver.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscDerandomizer.cc b/gr-atsc/lib/GrAtscDerandomizer.cc
index db3583a62c..ac1701d906 100644
--- a/gr-atsc/src/lib/GrAtscDerandomizer.cc
+++ b/gr-atsc/lib/GrAtscDerandomizer.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscDerandomizer.h>
+#include <atsc/GrAtscDerandomizer.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscEqualizer.cc b/gr-atsc/lib/GrAtscEqualizer.cc
index 27f64c2b76..3e9f8a0022 100644
--- a/gr-atsc/src/lib/GrAtscEqualizer.cc
+++ b/gr-atsc/lib/GrAtscEqualizer.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscEqualizer.h>
-#include <atsci_equalizer.h>
+#include <atsc/GrAtscEqualizer.h>
+#include <atsc/equalizer_impl.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscFPLL.cc b/gr-atsc/lib/GrAtscFPLL.cc
index df7d6b8c08..fc796c3c12 100644
--- a/gr-atsc/src/lib/GrAtscFPLL.cc
+++ b/gr-atsc/lib/GrAtscFPLL.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscFPLL.h>
+#include <atsc/GrAtscFPLL.h>
 #include <algorithm>
 #include "fpll_btloop_coupling.h"
 
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc b/gr-atsc/lib/GrAtscFieldSyncChecker.cc
index d2c82d6d47..0aaa98e4f6 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncChecker.cc
+++ b/gr-atsc/lib/GrAtscFieldSyncChecker.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscFieldSyncChecker.h>
-#include <create_atsci_fs_checker.h>
-#include <atsci_fs_checker.h>
+#include <atsc/GrAtscFieldSyncChecker.h>
+#include <atsc/create_atsci_fs_checker.h>
+#include <atsc/fs_checker_impl.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc b/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc
index 42f93aa8cf..5d42d3b5a9 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncCorrelator.cc
+++ b/gr-atsc/lib/GrAtscFieldSyncCorrelator.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscFieldSyncCorrelator.h>
-#include <create_atsci_fs_correlator.h>
-#include <atsci_fs_correlator.h>
+#include <atsc/GrAtscFieldSyncCorrelator.h>
+#include <atsc/create_atsci_fs_correlator.h>
+#include <atsc/fs_correlator_impl.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc b/gr-atsc/lib/GrAtscFieldSyncDemux.cc
index e311acc8ab..171d25d23d 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncDemux.cc
+++ b/gr-atsc/lib/GrAtscFieldSyncDemux.cc
@@ -21,10 +21,10 @@
  */
 
 #include <cmath>
-#include <GrAtscFieldSyncDemux.h>
-#include <atsc_consts.h>
-#include <atsc_types.h>
-#include <atsci_syminfo.h>
+#include <atsc/GrAtscFieldSyncDemux.h>
+#include <atsc/consts.h>
+#include <atsc/types.h>
+#include <atsc/syminfo_impl.h>
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/gr-atsc/src/lib/GrAtscFieldSyncMux.cc b/gr-atsc/lib/GrAtscFieldSyncMux.cc
index 7ebab72ad7..50ad55448d 100644
--- a/gr-atsc/src/lib/GrAtscFieldSyncMux.cc
+++ b/gr-atsc/lib/GrAtscFieldSyncMux.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscFieldSyncMux.h>
-#include <atsci_pnXXX.h>
+#include <atsc/GrAtscFieldSyncMux.h>
+#include <atsc/pnXXX_impl.h>
 
 
 // typedefs for fundamental i/o types
diff --git a/gr-atsc/src/lib/GrAtscInterleaver.cc b/gr-atsc/lib/GrAtscInterleaver.cc
index 2c8f0c7e83..58113bd5d4 100644
--- a/gr-atsc/src/lib/GrAtscInterleaver.cc
+++ b/gr-atsc/lib/GrAtscInterleaver.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscInterleaver.h>
+#include <atsc/GrAtscInterleaver.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscRSDecoder.cc b/gr-atsc/lib/GrAtscRSDecoder.cc
index fd0122ad22..211c569efd 100644
--- a/gr-atsc/src/lib/GrAtscRSDecoder.cc
+++ b/gr-atsc/lib/GrAtscRSDecoder.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscRSDecoder.h>
+#include <atsc/GrAtscRSDecoder.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscRSEncoder.cc b/gr-atsc/lib/GrAtscRSEncoder.cc
index 249678427b..f7a457351b 100644
--- a/gr-atsc/src/lib/GrAtscRSEncoder.cc
+++ b/gr-atsc/lib/GrAtscRSEncoder.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscRSEncoder.h>
+#include <atsc/GrAtscRSEncoder.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscRandomizer.cc b/gr-atsc/lib/GrAtscRandomizer.cc
index c5172699cc..b4123c788f 100644
--- a/gr-atsc/src/lib/GrAtscRandomizer.cc
+++ b/gr-atsc/lib/GrAtscRandomizer.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscRandomizer.h>
+#include <atsc/GrAtscRandomizer.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscSegSymSync.cc b/gr-atsc/lib/GrAtscSegSymSync.cc
index 2d9419c259..53d5d3b4bb 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSync.cc
+++ b/gr-atsc/lib/GrAtscSegSymSync.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscSegSymSync.h>
-#include <GrAtscSegSymSyncImpl_export.h>
+#include <atsc/GrAtscSegSymSync.h>
+#include <atsc/GrAtscSegSymSyncImpl_export.h>
 #include <iostream>
 #include <assert.h>
 
diff --git a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc b/gr-atsc/lib/GrAtscSegSymSyncImpl.cc
index 8e2cfc2085..425ab36d11 100644
--- a/gr-atsc/src/lib/GrAtscSegSymSyncImpl.cc
+++ b/gr-atsc/lib/GrAtscSegSymSyncImpl.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscSegSymSyncImpl.h>
-#include <GrAtscSegSymSyncImpl_export.h>
+#include <atsc/GrAtscSegSymSyncImpl.h>
+#include <atsc/GrAtscSegSymSyncImpl_export.h>
 #include <cmath>
 #include <assert.h>
 
diff --git a/gr-atsc/src/lib/GrAtscTrellisEncoder.cc b/gr-atsc/lib/GrAtscTrellisEncoder.cc
index a0df3e9a78..abe67d2a9e 100644
--- a/gr-atsc/src/lib/GrAtscTrellisEncoder.cc
+++ b/gr-atsc/lib/GrAtscTrellisEncoder.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscTrellisEncoder.h>
+#include <atsc/GrAtscTrellisEncoder.h>
 
 // typedefs for fundamental i/o types
 
diff --git a/gr-atsc/src/lib/GrAtscViterbiDecoder.cc b/gr-atsc/lib/GrAtscViterbiDecoder.cc
index c89b3556bb..986fe001dc 100644
--- a/gr-atsc/src/lib/GrAtscViterbiDecoder.cc
+++ b/gr-atsc/lib/GrAtscViterbiDecoder.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <GrAtscViterbiDecoder.h>
+#include <atsc/GrAtscViterbiDecoder.h>
 #include <iostream>
 
 // typedefs for fundamental i/o types
diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/lib/atsc_bit_timing_loop.cc
index dc43d28bc4..7287eee19f 100644
--- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc
+++ b/gr-atsc/lib/atsc_bit_timing_loop.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_bit_timing_loop.h>
+#include <atsc/bit_timing_loop.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 #include <string.h>
 
 // Input rate changed from 20MHz to 19.2 to support usrp at 3 * 6.4MHz
diff --git a/gr-atsc/src/lib/atsc_deinterleaver.cc b/gr-atsc/lib/atsc_deinterleaver.cc
index f251c7f4eb..bc6d742bf6 100644
--- a/gr-atsc/src/lib/atsc_deinterleaver.cc
+++ b/gr-atsc/lib/atsc_deinterleaver.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_deinterleaver.h>
+#include <atsc/deinterleaver.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_deinterleaver_sptr
diff --git a/gr-atsc/src/lib/atsc_depad.cc b/gr-atsc/lib/atsc_depad.cc
index 9792a4e6a4..7dd6ba1c68 100644
--- a/gr-atsc/src/lib/atsc_depad.cc
+++ b/gr-atsc/lib/atsc_depad.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_depad.h>
+#include <atsc/depad.h>
 #include <gr_io_signature.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 atsc_depad_sptr
 atsc_make_depad()
diff --git a/gr-atsc/src/lib/atsc_derandomizer.cc b/gr-atsc/lib/atsc_derandomizer.cc
index 6642adb25c..79b3612af4 100644
--- a/gr-atsc/src/lib/atsc_derandomizer.cc
+++ b/gr-atsc/lib/atsc_derandomizer.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_derandomizer.h>
+#include <atsc/derandomizer.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_derandomizer_sptr
diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.cc b/gr-atsc/lib/atsc_ds_to_softds.cc
index a8f93bde4e..06ea9686c0 100644
--- a/gr-atsc/src/lib/atsc_ds_to_softds.cc
+++ b/gr-atsc/lib/atsc_ds_to_softds.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_ds_to_softds.h>
+#include <atsc/ds_to_softds.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_ds_to_softds_sptr
diff --git a/gr-atsc/src/lib/atsc_equalizer.cc b/gr-atsc/lib/atsc_equalizer.cc
index b8f31aeb42..6838cc1547 100644
--- a/gr-atsc/src/lib/atsc_equalizer.cc
+++ b/gr-atsc/lib/atsc_equalizer.cc
@@ -24,11 +24,11 @@
 #include <config.h>
 #endif
 
-#include <atsc_equalizer.h>
-#include <create_atsci_equalizer.h>
+#include <atsc/equalizer.h>
+#include <atsc/create_atsci_equalizer.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
-#include <atsci_syminfo.h>
+#include <atsc/consts.h>
+#include <atsc/syminfo_impl.h>
 
 
 atsc_equalizer_sptr
diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.cc b/gr-atsc/lib/atsc_field_sync_demux.cc
index 2783e4a90b..7697a02c6a 100644
--- a/gr-atsc/src/lib/atsc_field_sync_demux.cc
+++ b/gr-atsc/lib/atsc_field_sync_demux.cc
@@ -25,11 +25,11 @@
 #endif
 
 #include <cmath>
-#include <atsc_field_sync_demux.h>
+#include <atsc/field_sync_demux.h>
 #include <gr_io_signature.h>
-#include <atsc_types.h>
-#include <atsc_consts.h>
-#include <atsci_syminfo.h>
+#include <atsc/types.h>
+#include <atsc/consts.h>
+#include <atsc/syminfo_impl.h>
 #include <stdio.h>
 #include <assert.h>
 #include <iostream>
diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.cc b/gr-atsc/lib/atsc_field_sync_mux.cc
index 99fa5bff36..578af9eff1 100644
--- a/gr-atsc/src/lib/atsc_field_sync_mux.cc
+++ b/gr-atsc/lib/atsc_field_sync_mux.cc
@@ -24,10 +24,10 @@
 #include <config.h>
 #endif
 
-#include <atsc_field_sync_mux.h>
+#include <atsc/field_sync_mux.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
-#include <atsci_pnXXX.h>
+#include <atsc/consts.h>
+#include <atsc/pnXXX_impl.h>
 
 
 atsc_field_sync_mux_sptr
diff --git a/gr-atsc/src/lib/atsc_fpll.cc b/gr-atsc/lib/atsc_fpll.cc
index c8d62c415f..999a326bee 100644
--- a/gr-atsc/src/lib/atsc_fpll.cc
+++ b/gr-atsc/lib/atsc_fpll.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_fpll.h>
+#include <atsc/fpll.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 #include <algorithm>
 #include "fpll_btloop_coupling.h"
 #include <gr_math.h>
diff --git a/gr-atsc/src/lib/atsc_fs_checker.cc b/gr-atsc/lib/atsc_fs_checker.cc
index f8c4e43d5b..41d16d20be 100644
--- a/gr-atsc/src/lib/atsc_fs_checker.cc
+++ b/gr-atsc/lib/atsc_fs_checker.cc
@@ -24,12 +24,12 @@
 #include <config.h>
 #endif
 
-#include <atsc_fs_checker.h>
-#include <create_atsci_fs_checker.h>
-#include <atsci_fs_checker.h>
+#include <atsc/fs_checker.h>
+#include <atsc/create_atsci_fs_checker.h>
+#include <atsc/fs_checker_impl.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
-#include <atsci_syminfo.h>
+#include <atsc/consts.h>
+#include <atsc/syminfo_impl.h>
 
 
 atsc_fs_checker_sptr
diff --git a/gr-atsc/src/lib/atsc_interleaver.cc b/gr-atsc/lib/atsc_interleaver.cc
index fff5b2fa66..e7c22316b5 100644
--- a/gr-atsc/src/lib/atsc_interleaver.cc
+++ b/gr-atsc/lib/atsc_interleaver.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_interleaver.h>
+#include <atsc/interleaver.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_interleaver_sptr
diff --git a/gr-atsc/src/lib/atsc_pad.cc b/gr-atsc/lib/atsc_pad.cc
index 317b16aca7..9b181a8b78 100644
--- a/gr-atsc/src/lib/atsc_pad.cc
+++ b/gr-atsc/lib/atsc_pad.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_pad.h>
+#include <atsc/pad.h>
 #include <gr_io_signature.h>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 static const int INTR = ATSC_MPEG_PKT_LENGTH;
 
diff --git a/gr-atsc/src/lib/atsc_randomizer.cc b/gr-atsc/lib/atsc_randomizer.cc
index 73375e84cd..8f88c51a26 100644
--- a/gr-atsc/src/lib/atsc_randomizer.cc
+++ b/gr-atsc/lib/atsc_randomizer.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_randomizer.h>
+#include <atsc/randomizer.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_randomizer_sptr
diff --git a/gr-atsc/src/lib/atsc_rs_decoder.cc b/gr-atsc/lib/atsc_rs_decoder.cc
index e4bb6e57ab..80ff41c2be 100644
--- a/gr-atsc/src/lib/atsc_rs_decoder.cc
+++ b/gr-atsc/lib/atsc_rs_decoder.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_rs_decoder.h>
+#include <atsc/rs_decoder.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_rs_decoder_sptr
diff --git a/gr-atsc/src/lib/atsc_rs_encoder.cc b/gr-atsc/lib/atsc_rs_encoder.cc
index 7c4ec293b4..9773f94489 100644
--- a/gr-atsc/src/lib/atsc_rs_encoder.cc
+++ b/gr-atsc/lib/atsc_rs_encoder.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_rs_encoder.h>
+#include <atsc/rs_encoder.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_rs_encoder_sptr
diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.cc b/gr-atsc/lib/atsc_trellis_encoder.cc
index fa0a889aa8..615864d971 100644
--- a/gr-atsc/src/lib/atsc_trellis_encoder.cc
+++ b/gr-atsc/lib/atsc_trellis_encoder.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_trellis_encoder.h>
+#include <atsc/trellis_encoder.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 
 
 atsc_trellis_encoder_sptr
diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.cc b/gr-atsc/lib/atsc_viterbi_decoder.cc
index 72b9a965bb..ca32c6d998 100644
--- a/gr-atsc/src/lib/atsc_viterbi_decoder.cc
+++ b/gr-atsc/lib/atsc_viterbi_decoder.cc
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <atsc_viterbi_decoder.h>
+#include <atsc/viterbi_decoder.h>
 #include <gr_io_signature.h>
-#include <atsc_consts.h>
+#include <atsc/consts.h>
 #include <iostream>
 
 using std::cerr;
diff --git a/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc b/gr-atsc/lib/atsci_basic_trellis_encoder.cc
index 2ae481cbcd..a4fa3d6d83 100644
--- a/gr-atsc/src/lib/atsci_basic_trellis_encoder.cc
+++ b/gr-atsc/lib/atsci_basic_trellis_encoder.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_basic_trellis_encoder.h>
+#include <atsc/basic_trellis_encoder_impl.h>
 #include <assert.h>
 
 const unsigned char atsci_basic_trellis_encoder::next_state[32] = {
diff --git a/gr-atsc/src/lib/atsci_data_interleaver.cc b/gr-atsc/lib/atsci_data_interleaver.cc
index a2eef0fea7..9aa2541412 100644
--- a/gr-atsc/src/lib/atsci_data_interleaver.cc
+++ b/gr-atsc/lib/atsci_data_interleaver.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_data_interleaver.h>
+#include <atsc/data_interleaver_impl.h>
 
 void
 atsci_data_interleaver::interleave (atsc_mpeg_packet_rs_encoded &out,
diff --git a/gr-atsc/src/lib/atsci_equalizer.cc b/gr-atsc/lib/atsci_equalizer.cc
index 4aec474957..6646810a2b 100644
--- a/gr-atsc/src/lib/atsci_equalizer.cc
+++ b/gr-atsc/lib/atsci_equalizer.cc
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_equalizer.h>
+#include <atsc/equalizer_impl.h>
 #include <algorithm>
 #include <iostream>
-#include <atsc_types.h>
+#include <atsc/types.h>
 
 using std::cerr;
 using std::endl;
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms.cc b/gr-atsc/lib/atsci_equalizer_lms.cc
index bab962e326..b4776faea6 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms.cc
+++ b/gr-atsc/lib/atsci_equalizer_lms.cc
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_equalizer_lms.h>
+#include <atsc/equalizer_lms_impl.h>
 #include <assert.h>
 #include <algorithm>
-#include <atsci_pnXXX.h>
+#include <atsc/pnXXX_impl.h>
 
 #include <stdio.h>
 
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/lib/atsci_equalizer_lms2.cc
index 2825aad507..2fad19b748 100644
--- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc
+++ b/gr-atsc/lib/atsci_equalizer_lms2.cc
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_equalizer_lms2.h>
+#include <atsc/equalizer_lms2_impl.h>
 #include <assert.h>
 #include <algorithm>
-#include <atsci_pnXXX.h>
+#include <atsc/pnXXX_impl.h>
 #include <cmath>
 #include <stdlib.h>
 #include <gr_math.h>
diff --git a/gr-atsc/src/lib/atsci_equalizer_nop.cc b/gr-atsc/lib/atsci_equalizer_nop.cc
index 5af2cc4e7a..61fed43d27 100644
--- a/gr-atsc/src/lib/atsci_equalizer_nop.cc
+++ b/gr-atsc/lib/atsci_equalizer_nop.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_equalizer_nop.h>
-#include <atsci_sync_tag.h>
+#include <atsc/equalizer_nop_impl.h>
+#include <atsc/sync_tag_impl.h>
 #include <assert.h>
 
 atsci_equalizer_nop::atsci_equalizer_nop ()
diff --git a/gr-atsc/src/lib/atsci_exp2_lp.cc b/gr-atsc/lib/atsci_exp2_lp.cc
index 8f411977e2..93e15f7023 100644
--- a/gr-atsc/src/lib/atsci_exp2_lp.cc
+++ b/gr-atsc/lib/atsci_exp2_lp.cc
@@ -21,7 +21,7 @@
  */
 
 #include <atsc_consts.h>
-#include <atsci_exp2_lp.h>
+#include <atsc/exp2_lp_impl.h>
 #include <stdexcept>
 #include <cmath>
 #include <iostream>
diff --git a/gr-atsc/src/lib/atsci_exp2_lp20.dat b/gr-atsc/lib/atsci_exp2_lp20.dat
index d09c5aca26..d09c5aca26 100644
--- a/gr-atsc/src/lib/atsci_exp2_lp20.dat
+++ b/gr-atsc/lib/atsci_exp2_lp20.dat
diff --git a/gr-atsc/src/lib/atsci_exp2_lp2x.dat b/gr-atsc/lib/atsci_exp2_lp2x.dat
index 67dd204cb4..67dd204cb4 100644
--- a/gr-atsc/src/lib/atsci_exp2_lp2x.dat
+++ b/gr-atsc/lib/atsci_exp2_lp2x.dat
diff --git a/gr-atsc/src/lib/atsci_fake_single_viterbi.cc b/gr-atsc/lib/atsci_fake_single_viterbi.cc
index 6246a90505..e94e7f0734 100644
--- a/gr-atsc/src/lib/atsci_fake_single_viterbi.cc
+++ b/gr-atsc/lib/atsci_fake_single_viterbi.cc
@@ -21,7 +21,7 @@
  */
 
 #include <math.h>
-#include <atsci_fake_single_viterbi.h>
+#include <atsc/fake_single_viterbi_impl.h>
 #include <iostream>
 #include <algorithm>
 
diff --git a/gr-atsc/src/lib/atsci_fs_checker.cc b/gr-atsc/lib/atsci_fs_checker.cc
index 7d321307cf..e43f88e33d 100644
--- a/gr-atsc/src/lib/atsci_fs_checker.cc
+++ b/gr-atsc/lib/atsci_fs_checker.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_fs_checker.h>
+#include <atsc/fs_checker_impl.h>
 
 // empty constructor
 atsci_fs_checker::atsci_fs_checker ()
diff --git a/gr-atsc/src/lib/atsci_fs_checker_naive.cc b/gr-atsc/lib/atsci_fs_checker_naive.cc
index f14472aa26..392bf70399 100644
--- a/gr-atsc/src/lib/atsci_fs_checker_naive.cc
+++ b/gr-atsc/lib/atsci_fs_checker_naive.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_fs_checker_naive.h>
-#include <atsci_syminfo.h>
-#include <atsci_pnXXX.h>
+#include <atsc/fs_checker_naive_impl.h>
+#include <atsc/syminfo_impl.h>
+#include <atsc/pnXXX_impl.h>
 #include <iostream>
 #include <cstring>
 
diff --git a/gr-atsc/src/lib/atsci_fs_correlator.cc b/gr-atsc/lib/atsci_fs_correlator.cc
index efeb351766..1dccfc5e21 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator.cc
+++ b/gr-atsc/lib/atsci_fs_correlator.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_fs_correlator.h>
+#include <atsc/fs_correlator_impl.h>
 
 // empty constructor
 atsci_fs_correlator::atsci_fs_correlator ()
diff --git a/gr-atsc/src/lib/atsci_fs_correlator_naive.cc b/gr-atsc/lib/atsci_fs_correlator_naive.cc
index ccf9035310..5bddcfa79c 100644
--- a/gr-atsc/src/lib/atsci_fs_correlator_naive.cc
+++ b/gr-atsc/lib/atsci_fs_correlator_naive.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_fs_correlator_naive.h>
-#include <atsci_sync_tag.h>
-#include <atsci_pnXXX.h>
+#include <atsc/fs_correlator_naive_impl.h>
+#include <atsc/sync_tag_impl.h>
+#include <atsc/pnXXX_impl.h>
 #include <iostream>
 #include <cstring>
 
diff --git a/gr-atsc/src/lib/atsci_pnXXX.cc b/gr-atsc/lib/atsci_pnXXX.cc
index 128582d2d8..93c9b22950 100644
--- a/gr-atsc/src/lib/atsci_pnXXX.cc
+++ b/gr-atsc/lib/atsci_pnXXX.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_pnXXX.h>
+#include <atsc/pnXXX_impl.h>
 
 const unsigned char atsc_pn511[511] = {
   0,0,0,0,  0,0,0,1,  0,1,1,1,  1,1,1,1,  1,1,0,0,  1,0,1,0,  1,0,1,0,  1,1,1,0,
diff --git a/gr-atsc/src/lib/atsci_randomizer.cc b/gr-atsc/lib/atsci_randomizer.cc
index 8766bbef05..6deadfecf8 100644
--- a/gr-atsc/src/lib/atsci_randomizer.cc
+++ b/gr-atsc/lib/atsci_randomizer.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_randomizer.h>
+#include <atsc/randomizer_impl.h>
 #include <assert.h>
 
 unsigned char atsci_randomizer::s_output_map[1 << 14];
diff --git a/gr-atsc/src/lib/atsci_reed_solomon.cc b/gr-atsc/lib/atsci_reed_solomon.cc
index a4a40e3f17..6aff353b4e 100644
--- a/gr-atsc/src/lib/atsci_reed_solomon.cc
+++ b/gr-atsc/lib/atsci_reed_solomon.cc
@@ -20,12 +20,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_reed_solomon.h>
+#include <atsc/reed_solomon_impl.h>
 #include <assert.h>
 #include <string.h>
 
 extern "C" {
-#include "rs.h"
+#include <fec/rs.h>
 }
 
 static const int rs_init_symsize =     8;
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine.cc b/gr-atsc/lib/atsci_root_raised_cosine.cc
index f555d90ac6..c5cedbd1fc 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine.cc
+++ b/gr-atsc/lib/atsci_root_raised_cosine.cc
@@ -20,9 +20,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsc_consts.h>
-#include <atsci_root_raised_cosine.h>
-#include <gr_firdes.h>
+#include <atsc/consts.h>
+#include <atsc/root_raised_cosine_impl.h>
+#include <filter/firdes.h>
 
 vector<float>
 atsc_root_raised_cosine::taps (double sampling_rate)
@@ -32,5 +32,5 @@ atsc_root_raised_cosine::taps (double sampling_rate)
   // static const int    NTAPS = 745;			// better number
   static const int    NTAPS = 279;			// better number
 
-  return gr_firdes::root_raised_cosine (1.0, sampling_rate, symbol_rate, .115, NTAPS);
+  return gr::filter::firdes::root_raised_cosine(1.0, sampling_rate, symbol_rate, .115, NTAPS);
 }
diff --git a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc b/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc
index f795a41666..5dd7705541 100644
--- a/gr-atsc/src/lib/atsci_root_raised_cosine_bandpass.cc
+++ b/gr-atsc/lib/atsci_root_raised_cosine_bandpass.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_root_raised_cosine_bandpass.h>
+#include <atsc/root_raised_cosine_bandpass_impl.h>
 #include <iostream>
 #include <cmath>
 
diff --git a/gr-atsc/src/lib/atsci_single_viterbi.cc b/gr-atsc/lib/atsci_single_viterbi.cc
index a1bf2ea49d..f53f16c8e1 100644
--- a/gr-atsc/src/lib/atsci_single_viterbi.cc
+++ b/gr-atsc/lib/atsci_single_viterbi.cc
@@ -21,7 +21,7 @@
  */
 
 #include <math.h>
-#include <atsci_single_viterbi.h>
+#include <atsc/single_viterbi_impl.h>
 #include <iostream>
 
 using std::cerr;
diff --git a/gr-atsc/src/lib/atsci_sliding_correlator.cc b/gr-atsc/lib/atsci_sliding_correlator.cc
index 877037db7d..b79adfb53b 100644
--- a/gr-atsc/src/lib/atsci_sliding_correlator.cc
+++ b/gr-atsc/lib/atsci_sliding_correlator.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_sliding_correlator.h>
-#include <atsci_pnXXX.h>
+#include <atsc/sliding_correlator_impl.h>
+#include <atsc/pnXXX_impl.h>
 
 // #define TRY_BACKWARDS
 
diff --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/lib/atsci_sssr.cc
index 56a0c6a004..5deeda86ce 100644
--- a/gr-atsc/src/lib/atsci_sssr.cc
+++ b/gr-atsc/lib/atsci_sssr.cc
@@ -20,12 +20,12 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_sssr.h>
+#include <atsc/sssr_impl.h>
 #include <algorithm>
 #include <cmath>
 #include <cstdio>
 #include <assert.h>
-#include <atsci_diag_output.h>
+#include <atsc/diag_output_impl.h>
 #include <gr_math.h>
 #include <stdio.h>
 #include <boost/math/special_functions/sign.hpp>
diff --git a/gr-atsc/src/lib/atsci_trellis_encoder.cc b/gr-atsc/lib/atsci_trellis_encoder.cc
index 2b3e851bc1..4e81c87e32 100644
--- a/gr-atsc/src/lib/atsci_trellis_encoder.cc
+++ b/gr-atsc/lib/atsci_trellis_encoder.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_trellis_encoder.h>
+#include <atsc/trellis_encoder_impl.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/gr-atsc/src/lib/atsci_viterbi_decoder.cc b/gr-atsc/lib/atsci_viterbi_decoder.cc
index 8804f60076..26f5577de5 100644
--- a/gr-atsc/src/lib/atsci_viterbi_decoder.cc
+++ b/gr-atsc/lib/atsci_viterbi_decoder.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsci_viterbi_decoder.h>
+#include <atsc/viterbi_decoder.h>
 #include <assert.h>
 #include <stdio.h>
 #include <cmath>
diff --git a/gr-atsc/src/lib/atsci_viterbi_gen.cc b/gr-atsc/lib/atsci_viterbi_gen.cc
index bff3c47736..bff3c47736 100644
--- a/gr-atsc/src/lib/atsci_viterbi_gen.cc
+++ b/gr-atsc/lib/atsci_viterbi_gen.cc
diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.cc b/gr-atsc/lib/atsci_vsbtx_lp.cc
index 704cd00ca4..4b6f82af3d 100644
--- a/gr-atsc/src/lib/atsci_vsbtx_lp.cc
+++ b/gr-atsc/lib/atsci_vsbtx_lp.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsc_consts.h>
-#include <atsci_vsbtx_lp.h>
+#include <atsc/consts.h>
+#include <atsc/vsbtx_lp_impl.h>
 #include <stdexcept>
 #include <cmath>
 #include <iostream>
diff --git a/gr-atsc/src/lib/atsci_vsbtx_lp.dat b/gr-atsc/lib/atsci_vsbtx_lp.dat
index 0fa54d42b5..0fa54d42b5 100644
--- a/gr-atsc/src/lib/atsci_vsbtx_lp.dat
+++ b/gr-atsc/lib/atsci_vsbtx_lp.dat
diff --git a/gr-atsc/src/lib/create_atsci_equalizer.cc b/gr-atsc/lib/create_atsci_equalizer.cc
index f784116d29..17874cdd47 100644
--- a/gr-atsc/src/lib/create_atsci_equalizer.cc
+++ b/gr-atsc/lib/create_atsci_equalizer.cc
@@ -20,10 +20,10 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <create_atsci_equalizer.h>
-#include <atsci_equalizer_nop.h>
-#include <atsci_equalizer_lms.h>
-#include <atsci_equalizer_lms2.h>
+#include <atsc/create_atsci_equalizer.h>
+#include <atsc/equalizer_nop_impl.h>
+#include <atsc/equalizer_lms_impl.h>
+#include <atsc/equalizer_lms2_impl.h>
 
 atsci_equalizer *
 create_atsci_equalizer_nop ()
diff --git a/gr-atsc/src/lib/create_atsci_fs_checker.cc b/gr-atsc/lib/create_atsci_fs_checker.cc
index 5b9a4092c4..1eea7bcc01 100644
--- a/gr-atsc/src/lib/create_atsci_fs_checker.cc
+++ b/gr-atsc/lib/create_atsci_fs_checker.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <create_atsci_fs_checker.h>
-#include <atsci_fs_checker_naive.h>
+#include <atsc/create_atsci_fs_checker.h>
+#include <atsc/fs_checker_naive_impl.h>
 
 atsci_fs_checker *
 create_atsci_fs_checker ()
diff --git a/gr-atsc/src/lib/create_atsci_fs_correlator.cc b/gr-atsc/lib/create_atsci_fs_correlator.cc
index 414b2d7f43..021d315de9 100644
--- a/gr-atsc/src/lib/create_atsci_fs_correlator.cc
+++ b/gr-atsc/lib/create_atsci_fs_correlator.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <create_atsci_fs_correlator.h>
-#include <atsci_fs_correlator_naive.h>
+#include <atsc/create_atsci_fs_correlator.h>
+#include <atsc/fs_correlator_naive_impl.h>
 
 atsci_fs_correlator *
 create_atsci_fs_correlator ()
diff --git a/gr-atsc/src/lib/fpll_btloop_coupling.h b/gr-atsc/lib/fpll_btloop_coupling.h
index 9a1a99d86d..9a1a99d86d 100644
--- a/gr-atsc/src/lib/fpll_btloop_coupling.h
+++ b/gr-atsc/lib/fpll_btloop_coupling.h
diff --git a/gr-atsc/src/lib/gen_encoder.py b/gr-atsc/lib/gen_encoder.py
index 6c8fabf7ad..6c8fabf7ad 100755
--- a/gr-atsc/src/lib/gen_encoder.py
+++ b/gr-atsc/lib/gen_encoder.py
diff --git a/gr-atsc/src/lib/gnuradio-atsc.rc.in b/gr-atsc/lib/gnuradio-atsc.rc.in
index f0d7699f00..f0d7699f00 100644
--- a/gr-atsc/src/lib/gnuradio-atsc.rc.in
+++ b/gr-atsc/lib/gnuradio-atsc.rc.in
diff --git a/gr-atsc/src/lib/plinfo.cc b/gr-atsc/lib/plinfo.cc
index 30e192907a..8ad28c6001 100644
--- a/gr-atsc/src/lib/plinfo.cc
+++ b/gr-atsc/lib/plinfo.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <atsc_types.h>
+#include <atsc/types.h>
 #include <assert.h>
 
 void
diff --git a/gr-atsc/src/lib/qa_atsci.cc b/gr-atsc/lib/qa_atsci.cc
index 8dc940bcb1..611440e96f 100644
--- a/gr-atsc/src/lib/qa_atsci.cc
+++ b/gr-atsc/lib/qa_atsci.cc
@@ -25,20 +25,20 @@
  * add them here.
  */
 
-#include <qa_atsci.h>
-#include <qa_atsci_randomizer.h>
-#include <qa_atsci_reed_solomon.h>
-#include <qa_interleaver_fifo.h>
-#include <qa_convolutional_interleaver.h>
-#include <qa_atsci_data_interleaver.h>
-#include <qa_atsci_basic_trellis_encoder.h>
-#include <qa_atsci_sliding_correlator.h>
-#include <qa_atsci_fake_single_viterbi.h>
-#include <qa_atsci_single_viterbi.h>
-#include <qa_atsci_trellis_encoder.h>
-#include <qa_atsci_viterbi_decoder.h>
-#include <qa_atsci_fs_correlator.h>
-#include <qa_atsci_equalizer_nop.h>
+#include "qa_atsci.h"
+#include "qa_atsci_randomizer.h"
+#include "qa_atsci_reed_solomon.h"
+#include "qa_interleaver_fifo.h"
+#include "qa_convolutional_interleaver.h"
+#include "qa_atsci_data_interleaver.h"
+#include "qa_atsci_basic_trellis_encoder.h"
+#include "qa_atsci_sliding_correlator.h"
+#include "qa_atsci_fake_single_viterbi.h"
+#include "qa_atsci_single_viterbi.h"
+#include "qa_atsci_trellis_encoder.h"
+#include "qa_atsci_viterbi_decoder.h"
+#include "qa_atsci_fs_correlator.h"
+#include "qa_atsci_equalizer_nop.h"
 
 CppUnit::TestSuite *
 qa_atsc::suite ()
diff --git a/gr-atsc/src/lib/qa_atsci.h b/gr-atsc/lib/qa_atsci.h
index 86aca2d32b..86aca2d32b 100644
--- a/gr-atsc/src/lib/qa_atsci.h
+++ b/gr-atsc/lib/qa_atsci.h
diff --git a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.cc
index 4a8137424c..2b64759c1f 100644
--- a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.cc
+++ b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <cppunit/TestAssert.h>
-#include <qa_atsci_basic_trellis_encoder.h>
+#include "qa_atsci_basic_trellis_encoder.h"
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h
index e413d0d3d3..c1e6e8f8ce 100644
--- a/gr-atsc/src/lib/qa_atsci_basic_trellis_encoder.h
+++ b/gr-atsc/lib/qa_atsci_basic_trellis_encoder.h
@@ -25,7 +25,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-#include <atsci_basic_trellis_encoder.h>
+#include <atsc/basic_trellis_encoder_impl.h>
 
 class qa_atsci_basic_trellis_encoder : public CppUnit::TestCase {
 
diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc b/gr-atsc/lib/qa_atsci_data_interleaver.cc
index 6069e86808..87cb45f49e 100644
--- a/gr-atsc/src/lib/qa_atsci_data_interleaver.cc
+++ b/gr-atsc/lib/qa_atsci_data_interleaver.cc
@@ -21,7 +21,7 @@
  */
 
 #include <cppunit/TestAssert.h>
-#include <qa_atsci_data_interleaver.h>
+#include "qa_atsci_data_interleaver.h"
 #include <string.h>
 
 
diff --git a/gr-atsc/src/lib/qa_atsci_data_interleaver.h b/gr-atsc/lib/qa_atsci_data_interleaver.h
index 6b9408c9a4..32c9e79c46 100644
--- a/gr-atsc/src/lib/qa_atsci_data_interleaver.h
+++ b/gr-atsc/lib/qa_atsci_data_interleaver.h
@@ -27,7 +27,7 @@
 #include <cppunit/TestCase.h>
 #include <stdio.h>
 
-#include <atsci_data_interleaver.h>
+#include <atsc/data_interleaver_impl.h>
 
 class qa_atsci_data_interleaver : public CppUnit::TestCase {
  public:
diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc b/gr-atsc/lib/qa_atsci_equalizer_nop.cc
index 7039eeb8ea..927e23fdac 100644
--- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.cc
+++ b/gr-atsc/lib/qa_atsci_equalizer_nop.cc
@@ -20,11 +20,11 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <qa_atsci_equalizer_nop.h>
-#include <atsci_equalizer.h>
-#include <atsci_equalizer_nop.h>
-#include <atsci_pnXXX.h>
-#include <atsc_types.h>
+#include "qa_atsci_equalizer_nop.h"
+#include <atsc/equalizer_impl.h>
+#include <atsc/equalizer_nop_impl.h>
+#include <atsc/pnXXX_impl.h>
+#include <atsc/types.h>
 #include <cppunit/TestAssert.h>
 #include <assert.h>
 #include <iostream>
diff --git a/gr-atsc/src/lib/qa_atsci_equalizer_nop.h b/gr-atsc/lib/qa_atsci_equalizer_nop.h
index 244daf8b3f..244daf8b3f 100644
--- a/gr-atsc/src/lib/qa_atsci_equalizer_nop.h
+++ b/gr-atsc/lib/qa_atsci_equalizer_nop.h
diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
index 2cc646dafd..88e2fdb929 100644
--- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.cc
+++ b/gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
@@ -26,8 +26,8 @@
 
 #include <cppunit/TestAssert.h>
 #include <stdio.h>
-#include <atsci_fake_single_viterbi.h>
-#include <qa_atsci_fake_single_viterbi.h>
+#include <atsc/fake_single_viterbi_impl.h>
+#include "qa_atsci_fake_single_viterbi.h"
 #include <random.h>
 #include <string.h>
 
diff --git a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h b/gr-atsc/lib/qa_atsci_fake_single_viterbi.h
index 47805952c9..373f4b6c67 100644
--- a/gr-atsc/src/lib/qa_atsci_fake_single_viterbi.h
+++ b/gr-atsc/lib/qa_atsci_fake_single_viterbi.h
@@ -26,8 +26,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-#include <atsci_fake_single_viterbi.h>
-#include <atsci_basic_trellis_encoder.h>
+#include <atsc/fake_single_viterbi_impl.h>
+#include <atsc/basic_trellis_encoder_impl.h>
 
 class qa_atsci_fake_single_viterbi : public CppUnit::TestCase {
  private:
diff --git a/gr-atsc/src/lib/qa_atsci_fs_correlator.cc b/gr-atsc/lib/qa_atsci_fs_correlator.cc
index 591c840502..a00731ab4d 100644
--- a/gr-atsc/src/lib/qa_atsci_fs_correlator.cc
+++ b/gr-atsc/lib/qa_atsci_fs_correlator.cc
@@ -24,14 +24,14 @@
 #include <config.h>
 #endif
 
-#include <qa_atsci_fs_correlator.h>
-#include <atsci_fs_correlator.h>
-#include <create_atsci_fs_correlator.h>
-#include <atsci_sync_tag.h>
+#include "qa_atsci_fs_correlator.h"
+#include <atsc/fs_correlator_impl.h>
+#include <atsc/create_atsci_fs_correlator.h>
+#include <atsc/sync_tag_impl.h>
 #include <stdlib.h>
 #include <algorithm>
-#include <atsci_pnXXX.h>
-#include <atsc_types.h>
+#include <atsc/pnXXX_impl.h>
+#include <atsc/types.h>
 #include <cppunit/TestAssert.h>
 #include <assert.h>
 #include <random.h>
diff --git a/gr-atsc/src/lib/qa_atsci_fs_correlator.h b/gr-atsc/lib/qa_atsci_fs_correlator.h
index 4785f096ec..4785f096ec 100644
--- a/gr-atsc/src/lib/qa_atsci_fs_correlator.h
+++ b/gr-atsc/lib/qa_atsci_fs_correlator.h
diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.cc b/gr-atsc/lib/qa_atsci_randomizer.cc
index c12582dfd0..a750fbb5da 100644
--- a/gr-atsc/src/lib/qa_atsci_randomizer.cc
+++ b/gr-atsc/lib/qa_atsci_randomizer.cc
@@ -20,7 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <qa_atsci_randomizer.h>
+#include "qa_atsci_randomizer.h"
 
 #include <cppunit/TestAssert.h>
 #include <string.h>
diff --git a/gr-atsc/src/lib/qa_atsci_randomizer.h b/gr-atsc/lib/qa_atsci_randomizer.h
index 16d12754ff..0255d8a4ae 100644
--- a/gr-atsc/src/lib/qa_atsci_randomizer.h
+++ b/gr-atsc/lib/qa_atsci_randomizer.h
@@ -25,7 +25,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-#include <atsci_randomizer.h>
+#include <atsc/randomizer_impl.h>
 
 class qa_atsci_randomizer : public CppUnit::TestCase {
  private:
diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc b/gr-atsc/lib/qa_atsci_reed_solomon.cc
index 81766f856a..50acb76a01 100644
--- a/gr-atsc/src/lib/qa_atsci_reed_solomon.cc
+++ b/gr-atsc/lib/qa_atsci_reed_solomon.cc
@@ -27,8 +27,8 @@
 #include <cppunit/TestAssert.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <atsci_reed_solomon.h>
-#include <qa_atsci_reed_solomon.h>
+#include <atsc/reed_solomon_impl.h>
+#include "qa_atsci_reed_solomon.h"
 #include <string.h>
 
 
diff --git a/gr-atsc/src/lib/qa_atsci_reed_solomon.h b/gr-atsc/lib/qa_atsci_reed_solomon.h
index 95d642e72d..097d681302 100644
--- a/gr-atsc/src/lib/qa_atsci_reed_solomon.h
+++ b/gr-atsc/lib/qa_atsci_reed_solomon.h
@@ -26,7 +26,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-#include <atsci_reed_solomon.h>
+#include <atsc/reed_solomon_impl.h>
 
 class qa_atsci_reed_solomon : public CppUnit::TestCase {
 
diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/lib/qa_atsci_single_viterbi.cc
index 699dce9526..be5187dc25 100644
--- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc
+++ b/gr-atsc/lib/qa_atsci_single_viterbi.cc
@@ -27,8 +27,8 @@
 #include <cppunit/TestAssert.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <atsci_single_viterbi.h>
-#include <qa_atsci_single_viterbi.h>
+#include <atsc/single_viterbi_impl.h>
+#include "qa_atsci_single_viterbi.h"
 #include <random.h>
 #include <string.h>
 
diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.h b/gr-atsc/lib/qa_atsci_single_viterbi.h
index 07585de22a..bfd911ab08 100644
--- a/gr-atsc/src/lib/qa_atsci_single_viterbi.h
+++ b/gr-atsc/lib/qa_atsci_single_viterbi.h
@@ -26,8 +26,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-#include <atsci_single_viterbi.h>
-#include <atsci_basic_trellis_encoder.h>
+#include <atsc/single_viterbi_impl.h>
+#include <atsc/basic_trellis_encoder_impl.h>
 
 class qa_atsci_single_viterbi : public CppUnit::TestCase {
  private:
diff --git a/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc b/gr-atsc/lib/qa_atsci_sliding_correlator.cc
index 4b215ba855..8b00e0ff08 100644
--- a/gr-atsc/src/lib/qa_atsci_sliding_correlator.cc
+++ b/gr-atsc/lib/qa_atsci_sliding_correlator.cc
@@ -21,7 +21,7 @@
  */
 
 #include <cppunit/TestAssert.h>
-#include <qa_atsci_sliding_correlator.h>
+#include "qa_atsci_sliding_correlator.h"
 #include <cstdio>
 
 void
diff --git a/gr-atsc/src/lib/qa_atsci_sliding_correlator.h b/gr-atsc/lib/qa_atsci_sliding_correlator.h
index bdcd09319a..34f12cbcbc 100644
--- a/gr-atsc/src/lib/qa_atsci_sliding_correlator.h
+++ b/gr-atsc/lib/qa_atsci_sliding_correlator.h
@@ -27,7 +27,7 @@
 #include <cppunit/TestCase.h>
 #include <stdio.h>
 
-#include <atsci_sliding_correlator.h>
+#include <atsc/sliding_correlator_impl.h>
 
 class qa_atsci_sliding_correlator : public CppUnit::TestCase {
 
diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc b/gr-atsc/lib/qa_atsci_trellis_encoder.cc
index d3a3482f0a..902dcebf82 100644
--- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.cc
+++ b/gr-atsc/lib/qa_atsci_trellis_encoder.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <cppunit/TestAssert.h>
-#include <qa_atsci_trellis_encoder.h>
+#include "qa_atsci_trellis_encoder.h"
 #include <cstdio>
 #include <string.h>
 #include <stdlib.h>
diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder.h b/gr-atsc/lib/qa_atsci_trellis_encoder.h
index fcd1143305..a93c0c3895 100644
--- a/gr-atsc/src/lib/qa_atsci_trellis_encoder.h
+++ b/gr-atsc/lib/qa_atsci_trellis_encoder.h
@@ -27,7 +27,7 @@
 #include <cppunit/TestCase.h>
 #include <stdio.h>
 
-#include <atsci_trellis_encoder.h>
+#include <atsc/trellis_encoder_impl.h>
 
 class qa_atsci_trellis_encoder : public CppUnit::TestCase {
 
diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder_t1_input.dat b/gr-atsc/lib/qa_atsci_trellis_encoder_t1_input.dat
index e6109ddfc6..e6109ddfc6 100644
--- a/gr-atsc/src/lib/qa_atsci_trellis_encoder_t1_input.dat
+++ b/gr-atsc/lib/qa_atsci_trellis_encoder_t1_input.dat
diff --git a/gr-atsc/src/lib/qa_atsci_trellis_encoder_t1_output.dat b/gr-atsc/lib/qa_atsci_trellis_encoder_t1_output.dat
index 175d482b4c..175d482b4c 100644
--- a/gr-atsc/src/lib/qa_atsci_trellis_encoder_t1_output.dat
+++ b/gr-atsc/lib/qa_atsci_trellis_encoder_t1_output.dat
diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc b/gr-atsc/lib/qa_atsci_viterbi_decoder.cc
index 8902b6eb8a..cd19804765 100644
--- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.cc
+++ b/gr-atsc/lib/qa_atsci_viterbi_decoder.cc
@@ -25,8 +25,8 @@
 #endif
 
 #include <cppunit/TestAssert.h>
-#include <qa_atsci_viterbi_decoder.h>
-#include <qa_atsci_trellis_encoder.h>
+#include "qa_atsci_viterbi_decoder.h"
+#include "qa_atsci_trellis_encoder.h"
 #include <cstdio>
 #include <string.h>
 #include <stdlib.h>
diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h b/gr-atsc/lib/qa_atsci_viterbi_decoder.h
index 440c79caf2..94b5ce21d2 100644
--- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder.h
+++ b/gr-atsc/lib/qa_atsci_viterbi_decoder.h
@@ -27,7 +27,7 @@
 #include <cppunit/TestCase.h>
 
 #include <stdio.h>
-#include <atsci_viterbi_decoder.h>
+#include <atsc/viterbi_decoder_impl.h>
 
 class qa_atsci_viterbi_decoder : public CppUnit::TestCase {
 
diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder_t1_input.dat b/gr-atsc/lib/qa_atsci_viterbi_decoder_t1_input.dat
index b2f356c877..b2f356c877 100644
--- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder_t1_input.dat
+++ b/gr-atsc/lib/qa_atsci_viterbi_decoder_t1_input.dat
diff --git a/gr-atsc/src/lib/qa_atsci_viterbi_decoder_t1_output.dat b/gr-atsc/lib/qa_atsci_viterbi_decoder_t1_output.dat
index 462b664b5d..462b664b5d 100644
--- a/gr-atsc/src/lib/qa_atsci_viterbi_decoder_t1_output.dat
+++ b/gr-atsc/lib/qa_atsci_viterbi_decoder_t1_output.dat
diff --git a/gr-atsc/src/lib/qa_convolutional_interleaver.cc b/gr-atsc/lib/qa_convolutional_interleaver.cc
index bfe86f0eaa..c7b8494f1e 100644
--- a/gr-atsc/src/lib/qa_convolutional_interleaver.cc
+++ b/gr-atsc/lib/qa_convolutional_interleaver.cc
@@ -21,7 +21,7 @@
  */
 
 #include <cppunit/TestAssert.h>
-#include <qa_convolutional_interleaver.h>
+#include "qa_convolutional_interleaver.h"
 
 void
 qa_convolutional_interleaver::t0 ()
diff --git a/gr-atsc/src/lib/qa_convolutional_interleaver.h b/gr-atsc/lib/qa_convolutional_interleaver.h
index b60181d732..afe795a547 100644
--- a/gr-atsc/src/lib/qa_convolutional_interleaver.h
+++ b/gr-atsc/lib/qa_convolutional_interleaver.h
@@ -26,7 +26,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-#include <convolutional_interleaver.h>
+#include <atsc/convolutional_interleaver.h>
 
 class qa_convolutional_interleaver : public CppUnit::TestCase {
  private:
diff --git a/gr-atsc/src/lib/qa_interleaver_fifo.cc b/gr-atsc/lib/qa_interleaver_fifo.cc
index a9de97ff39..7ce98630ec 100644
--- a/gr-atsc/src/lib/qa_interleaver_fifo.cc
+++ b/gr-atsc/lib/qa_interleaver_fifo.cc
@@ -21,7 +21,7 @@
  */
 
 #include <cppunit/TestAssert.h>
-#include <qa_interleaver_fifo.h>
+#include "qa_interleaver_fifo.h"
 
 void
 qa_interleaver_fifo::t0 ()
diff --git a/gr-atsc/src/lib/qa_interleaver_fifo.h b/gr-atsc/lib/qa_interleaver_fifo.h
index 9783548ca6..d0651b591f 100644
--- a/gr-atsc/src/lib/qa_interleaver_fifo.h
+++ b/gr-atsc/lib/qa_interleaver_fifo.h
@@ -26,7 +26,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestCase.h>
 
-#include <interleaver_fifo.h>
+#include <atsc/interleaver_fifo.h>
 
 class qa_interleaver_fifo : public CppUnit::TestCase {
  private:
diff --git a/gr-atsc/src/lib/test_atsci.cc b/gr-atsc/lib/test_atsci.cc
index bf0a7eafca..9aeb718cb8 100644
--- a/gr-atsc/src/lib/test_atsci.cc
+++ b/gr-atsc/lib/test_atsci.cc
@@ -23,7 +23,7 @@
 #include <gr_unittests.h>
 #include <cppunit/TextTestRunner.h>
 #include <cppunit/XmlOutputter.h>
-#include <qa_atsci.h>
+#include "qa_atsci.h"
 
 int
 main (int argc, char **argv)
diff --git a/gr-atsc/src/python/CMakeLists.txt b/gr-atsc/python/CMakeLists.txt
index fa9f91156b..aaa5bd93c4 100644
--- a/gr-atsc/src/python/CMakeLists.txt
+++ b/gr-atsc/python/CMakeLists.txt
@@ -46,8 +46,10 @@ if(ENABLE_TESTING)
 
 list(APPEND GR_TEST_PYTHON_DIRS
     ${CMAKE_BINARY_DIR}/gr-atsc/src/lib
+    ${CMAKE_BINARY_DIR}/gr-blocks/python
+    ${CMAKE_BINARY_DIR}/gr-blocks/swig
 )
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc)
+list(APPEND GR_TEST_TARGET_DEPS gnuradio-atsc gnuradio-fec gnuradio-filter gnuradio-analog gnuradio-fft)
 
 include(GrTest)
 file(GLOB py_qa_test_files "qa_*.py")
diff --git a/gr-atsc/src/python/README b/gr-atsc/python/README
index 74d6ba134c..74d6ba134c 100644
--- a/gr-atsc/src/python/README
+++ b/gr-atsc/python/README
diff --git a/gr-atsc/src/python/all_atsc.py b/gr-atsc/python/all_atsc.py
index 0137839bdc..7cac785149 100644
--- a/gr-atsc/src/python/all_atsc.py
+++ b/gr-atsc/python/all_atsc.py
@@ -33,6 +33,8 @@
 # then at 0 with edges at -3.2MHz and 3.2MHz.
 
 from gnuradio import gr, atsc
+from gnuradio import filter
+from gnuradio import blocks
 import sys, os, math
 
 def graph (args):
@@ -47,25 +49,25 @@ def graph (args):
     tb = gr.top_block ()
 
     # Convert to a from shorts to a stream of complex numbers.
-    srcf = gr.file_source (gr.sizeof_short,infile)
-    s2ss = gr.stream_to_streams(gr.sizeof_short,2)
-    s2f1 = gr.short_to_float()
-    s2f2 = gr.short_to_float()
-    src0 = gr.float_to_complex()
+    srcf = blocks.file_source (gr.sizeof_short,infile)
+    s2ss = blocks.stream_to_streams(gr.sizeof_short,2)
+    s2f1 = blocks.short_to_float()
+    s2f2 = blocks.short_to_float()
+    src0 = blocks.float_to_complex()
     tb.connect(srcf, s2ss)
     tb.connect((s2ss, 0), s2f1, (src0, 0))
     tb.connect((s2ss, 1), s2f2, (src0, 1))
 
     # Low pass filter it and increase sample rate by a factor of 3.
-    lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING )
-    lp = gr.interp_fir_filter_ccf ( 3, lp_coeffs )
+    lp_coeffs = filter.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, filter.firdes.WIN_HAMMING )
+    lp = filter.interp_fir_filter_ccf ( 3, lp_coeffs )
     tb.connect(src0, lp)
 
     # Upconvert it.
-    duc_coeffs = gr.firdes.low_pass ( 1, 19.2e6, 9e6, 1e6, gr.firdes.WIN_HAMMING )
-    duc = gr.freq_xlating_fir_filter_ccf ( 1, duc_coeffs, 5.75e6, 19.2e6 )
+    duc_coeffs = filter.firdes.low_pass ( 1, 19.2e6, 9e6, 1e6, filter.firdes.WIN_HAMMING )
+    duc = filter.freq_xlating_fir_filter_ccf ( 1, duc_coeffs, 5.75e6, 19.2e6 )
     # Discard the imaginary component.
-    c2f = gr.complex_to_float()
+    c2f = blocks.complex_to_float()
     tb.connect(lp, duc, c2f)
 
     # Frequency Phase Lock Loop
@@ -74,7 +76,7 @@ def graph (args):
     # 1/2 as wide because we're designing lp filter
     symbol_rate = atsc.ATSC_SYMBOL_RATE/2.
     NTAPS = 279
-    tt = gr.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
+    tt = filter.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
     # heterodyne the low pass coefficients up to the specified bandpass
     # center frequency.  Note that when we do this, the filter bandwidth
     # is effectively twice the low pass (2.69 * 2 = 5.38) and hence
@@ -83,7 +85,7 @@ def graph (args):
     t=[]
     for i in range(len(tt)):
         t += [tt[i] * 2. * math.cos(arg * i)]
-    rrc = gr.fir_filter_fff(1, t)
+    rrc = filter.fir_filter_fff(1, t)
 
     fpll = atsc.fpll()
 
@@ -91,17 +93,17 @@ def graph (args):
     lower_edge = 6e6 - 0.31e6
     upper_edge = IF_freq - 3e6 + pilot_freq
     transition_width = upper_edge - lower_edge
-    lp_coeffs = gr.firdes.low_pass (1.0,
-                                    input_rate,
-                                    (lower_edge + upper_edge) * 0.5,
-                                    transition_width,
-                                    gr.firdes.WIN_HAMMING);
+    lp_coeffs = filter.firdes.low_pass(1.0,
+                                       input_rate,
+                                       (lower_edge + upper_edge) * 0.5,
+                                       transition_width,
+                                       filter.firdes.WIN_HAMMING);
     
-    lp_filter = gr.fir_filter_fff (1,lp_coeffs)
+    lp_filter = filter.fir_filter_fff(1,lp_coeffs)
     
     alpha = 1e-5
-    iir = gr.single_pole_iir_filter_ff(alpha)
-    remove_dc = gr.sub_ff()
+    iir = filter.single_pole_iir_filter_ff(alpha)
+    remove_dc = blocks.sub_ff()
 
     tb.connect(c2f, fpll, lp_filter)
     tb.connect(lp_filter, iir)
@@ -126,10 +128,10 @@ def graph (args):
     rs_dec = atsc.rs_decoder()
     derand = atsc.derandomizer()
     depad = atsc.depad()
-    dst = gr.file_sink(gr.sizeof_char, outfile)
+    dst = blocks.file_sink(gr.sizeof_char, outfile)
     tb.connect(fsd, viterbi, deinter, rs_dec, derand, depad, dst)
 
-    dst2 = gr.file_sink(gr.sizeof_gr_complex, "atsc_complex.data")
+    dst2 = blocks.file_sink(gr.sizeof_gr_complex, "atsc_complex.data")
     tb.connect(src0, dst2)
 
     tb.run ()
diff --git a/gr-atsc/src/python/atsc_utils.py b/gr-atsc/python/atsc_utils.py
index fced6d1902..fc2465bed2 100644
--- a/gr-atsc/src/python/atsc_utils.py
+++ b/gr-atsc/python/atsc_utils.py
@@ -28,7 +28,8 @@ def make_fake_transport_stream_packet(npkts):
     """
     Return a sequence of 8-bit ints that represents an MPEG Transport Stream packet.
 
-    @param npkts: how many 188-byte packets to return
+    Args:
+        npkts: how many 188-byte packets to return
 
     FYI, each ATSC Data Frame contains two Data Fields, each of which contains
     312 data segments.  Each transport stream packet maps to a data segment.
diff --git a/gr-atsc/src/python/btl-fsd.py b/gr-atsc/python/btl-fsd.py
index 826e71016c..6bcab3dce3 100755
--- a/gr-atsc/src/python/btl-fsd.py
+++ b/gr-atsc/python/btl-fsd.py
@@ -22,6 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import atsc
+from gnuradio import blocks
 import os
 
 print os.getpid()
@@ -33,9 +34,9 @@ fsc = atsc.fs_checker()
 eq = atsc.equalizer()
 fsd = atsc.field_sync_demux()
 
-out_data = gr.file_sink(atsc.sizeof_atsc_soft_data_segment,"/tmp/atsc_pipe_5")
+out_data = blocks.file_sink(atsc.sizeof_atsc_soft_data_segment,"/tmp/atsc_pipe_5")
 
-inp = gr.file_source(gr.sizeof_float,"/tmp/atsc_pipe_3")
+inp = blocks.file_source(gr.sizeof_float,"/tmp/atsc_pipe_3")
 
 tb.connect(inp,btl)
 tb.connect((btl,0),(fsc,0),(eq,0),(fsd,0))
diff --git a/gr-atsc/src/python/fpll.py b/gr-atsc/python/fpll.py
index aed975557a..dee81da13d 100755
--- a/gr-atsc/src/python/fpll.py
+++ b/gr-atsc/python/fpll.py
@@ -21,6 +21,8 @@
 #
 
 from gnuradio import gr, atsc
+from gnuradio import blocks
+from gnuradio import filter
 import math, os
 
 def main():
@@ -29,7 +31,7 @@ def main():
 
 	tb = gr.top_block()
 
-        u = gr.file_source(gr.sizeof_float,"/tmp/atsc_pipe_2")
+        u = blocks.file_source(gr.sizeof_float,"/tmp/atsc_pipe_2")
 
         input_rate = 19.2e6
 	IF_freq = 5.75e6
@@ -38,7 +40,7 @@ def main():
 	# 1/2 as wide because we're designing lp filter
 	symbol_rate = atsc.ATSC_SYMBOL_RATE/2.
 	NTAPS = 279
-	tt = gr.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
+	tt = filter.firdes.root_raised_cosine (1.0, input_rate, symbol_rate, .115, NTAPS)
   # heterodyne the low pass coefficients up to the specified bandpass
   # center frequency.  Note that when we do this, the filter bandwidth
   # is effectively twice the low pass (2.69 * 2 = 5.38) and hence
@@ -47,7 +49,7 @@ def main():
 	t=[]
 	for i in range(len(tt)):
 	  t += [tt[i] * 2. * math.cos(arg * i)]
-	rrc = gr.fir_filter_fff(1, t)
+	rrc = filter.fir_filter_fff(1, t)
 
 	fpll = atsc.fpll()
 
@@ -55,20 +57,20 @@ def main():
 	lower_edge = 6e6 - 0.31e6
 	upper_edge = IF_freq - 3e6 + pilot_freq
 	transition_width = upper_edge - lower_edge
-	lp_coeffs = gr.firdes.low_pass (1.0,
+	lp_coeffs = filter.firdes.low_pass (1.0,
 			   input_rate,
 			   (lower_edge + upper_edge) * 0.5,
                            transition_width,
-                           gr.firdes.WIN_HAMMING);
+                           filter.firdes.WIN_HAMMING);
 
-	lp_filter = gr.fir_filter_fff (1,lp_coeffs)
+	lp_filter = filter.fir_filter_fff (1,lp_coeffs)
 
 	alpha = 1e-5
-	iir = gr.single_pole_iir_filter_ff(alpha)
-	remove_dc = gr.sub_ff()
+	iir = filter.single_pole_iir_filter_ff(alpha)
+	remove_dc = blocks.sub_ff()
 
-	out = gr.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_3")
-	# out = gr.file_sink(gr.sizeof_float,"/mnt/sata/atsc_data_float")
+	out = blocks.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_3")
+	# out = blocks.file_sink(gr.sizeof_float,"/mnt/sata/atsc_data_float")
 
         tb.connect(u, fpll, lp_filter)
 	tb.connect(lp_filter, iir)
diff --git a/gr-atsc/src/python/interp.py b/gr-atsc/python/interp.py
index 8a3cc8d4c5..ee2d234892 100755
--- a/gr-atsc/src/python/interp.py
+++ b/gr-atsc/python/interp.py
@@ -32,33 +32,35 @@
 # then at 0 with edges at -3.2MHz and 3.2MHz.
 
 from gnuradio import gr
+from gnuradio import blocks
 import sys
 
-def graph (args):
+def graph(args):
 
-    nargs = len (args)
+    nargs = len(args)
     if nargs == 1:
 	infile = args[0]
     else:
 	sys.stderr.write('usage: interp.py input_file\n')
-	sys.exit (1)
+	sys.exit(1)
 
-    tb = gr.top_block ()
+    tb = gr.top_block()
 
-    src0 = gr.file_source (gr.sizeof_gr_complex,infile)
+    src0 = blocks.file_source(gr.sizeof_gr_complex, infile)
 
-    lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING )
-    lp = gr.interp_fir_filter_ccf ( 1, lp_coeffs )
+    lp_coeffs = filter.firdes.low_pass(3, 19.2e6, 3.2e6, .5e6,
+                                       filter.firdes.WIN_HAMMING )
+    lp = filter.interp_fir_filter_ccf(1, lp_coeffs)
 
-    file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
+    file = blocks.file_sink(gr.sizeof_gr_complex, "/tmp/atsc_pipe_1")
 
-    tb.connect( src0, lp, file )
+    tb.connect(src0, lp, file)
 
     tb.start()
-    raw_input ('Head End: Press Enter to stop')
+    raw_input('Head End: Press Enter to stop')
     tb.stop()
 
 if __name__ == '__main__':
-    graph (sys.argv[1:])
+    graph(sys.argv[1:])
 
 
diff --git a/gr-atsc/src/python/interp_short.py b/gr-atsc/python/interp_short.py
index c5ea337f9a..d07b941c12 100755
--- a/gr-atsc/src/python/interp_short.py
+++ b/gr-atsc/python/interp_short.py
@@ -33,6 +33,8 @@
 # then at 0 with edges at -3.2MHz and 3.2MHz.
 
 from gnuradio import gr
+from gnuradio import blocks
+from gnuradio import filter
 import sys, os
 
 def graph (args):
@@ -46,19 +48,20 @@ def graph (args):
 	sys.stderr.write('usage: interp.py input_file\n')
 	sys.exit (1)
 
-    tb = gr.top_block ()
+    tb = gr.top_block()
 
-    srcf = gr.file_source (gr.sizeof_short,infile)
-    s2ss = gr.stream_to_streams(gr.sizeof_short,2)
-    s2f1 = gr.short_to_float()
-    s2f2 = gr.short_to_float()
-    src0 = gr.float_to_complex()
+    srcf = blocks.file_source(gr.sizeof_short,infile)
+    s2ss = blocks.stream_to_streams(gr.sizeof_short,2)
+    s2f1 = blocks.short_to_float()
+    s2f2 = blocks.short_to_float()
+    src0 = blocks.float_to_complex()
 
 
-    lp_coeffs = gr.firdes.low_pass ( 3, 19.2e6, 3.2e6, .5e6, gr.firdes.WIN_HAMMING )
-    lp = gr.interp_fir_filter_ccf ( 3, lp_coeffs )
+    lp_coeffs = filter.firdes.low_pass(3, 19.2e6, 3.2e6, .5e6,
+                                       filter.firdes.WIN_HAMMING)
+    lp = filter.interp_fir_filter_ccf(3, lp_coeffs)
 
-    file = gr.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
+    file = blocks.file_sink(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
 
     tb.connect( srcf, s2ss )
     tb.connect( (s2ss, 0), s2f1, (src0,0) )
diff --git a/gr-atsc/src/python/qa_atsc.py b/gr-atsc/python/qa_atsc.py
index c6b8d2e957..507bc8aa47 100755
--- a/gr-atsc/src/python/qa_atsc.py
+++ b/gr-atsc/python/qa_atsc.py
@@ -25,7 +25,7 @@ import atsc                    # qa code needs to run without being installed
 #from gnuradio import atsc
 from atsc_utils import *
 import sys
-
+import blocks_swig as blocks
 
 class memoize(object):
     def __init__(self, thunk):
@@ -76,12 +76,12 @@ class vector_source_ts(gr.hier_block2):
         """
         Pad tranport stream packets to 256 bytes and reformat appropriately.
 
-        @param ts: MPEG transport stream.
-        @type  ts: sequence of ints in [0,255]; len(ts) % 188 == 0
+        Args:
+            ts: MPEG transport stream. (sequence of ints in [0,255]; len(ts) % 188 == 0)
         """
 
         src = gr.vector_source_b(pad_transport_stream(ts))
-        s2v = gr.stream_to_vector(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
+        s2v = blocks.stream_to_vector(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
 
 	gr.hier_block2.__init__(self, "vector_source_ts",
 				gr.io_signature(0, 0, 0),
@@ -97,7 +97,7 @@ class vector_sink_ts(gr.hier_block2):
         """
         """
 
-        v2s = gr.vector_to_stream(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
+        v2s = blocks.vector_to_stream(gr.sizeof_char, atsc.sizeof_atsc_mpeg_packet)
         self.sink = gr.vector_sink_b()
 	gr.hier_block2.__init__(self, "vector_sink_ts",
 				v2s.input_signature(),
diff --git a/gr-atsc/src/python/viterbi-out.py b/gr-atsc/python/viterbi-out.py
index 67edd99b25..cc60ffda42 100755
--- a/gr-atsc/src/python/viterbi-out.py
+++ b/gr-atsc/python/viterbi-out.py
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, atsc
+from gnuradio import blocks
 import sys, os
 
 def main(args):
@@ -36,13 +37,13 @@ def main(args):
 
 	tb = gr.top_block()
 
-        src = gr.file_source(atsc.sizeof_atsc_soft_data_segment, "/tmp/atsc_pipe_5")
+        src = blocks.file_source(atsc.sizeof_atsc_soft_data_segment, "/tmp/atsc_pipe_5")
 	viterbi = atsc.viterbi_decoder()
         deinter = atsc.deinterleaver()
         rs_dec = atsc.rs_decoder()
         derand = atsc.derandomizer()
 	depad = atsc.depad()
-        dst = gr.file_sink(gr.sizeof_char,outfile)
+        dst = blocks.file_sink(gr.sizeof_char,outfile)
 	tb.connect(src, viterbi, deinter, rs_dec, derand, depad, dst)
         tb.run ()
 
diff --git a/gr-atsc/src/python/xlate.py b/gr-atsc/python/xlate.py
index 68e280a8ce..3d049ac524 100755
--- a/gr-atsc/src/python/xlate.py
+++ b/gr-atsc/python/xlate.py
@@ -32,6 +32,8 @@
 # Input complex -3.2 to 3.2Mhz, output float 2.55 to 8.95Mhz.
 
 from gnuradio import gr
+from gnuradio import filter
+from gnuradio import blocks
 import os
 
 def graph ():
@@ -40,13 +42,13 @@ def graph ():
 
     tb = gr.top_block ()
 
-    src0 = gr.file_source (gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
+    src0 = blocks.file_source(gr.sizeof_gr_complex,"/tmp/atsc_pipe_1")
 
-    duc_coeffs = gr.firdes.low_pass ( 1, 19.2e6, 9e6, 1e6, gr.firdes.WIN_HAMMING )
-    duc = gr.freq_xlating_fir_filter_ccf ( 1, duc_coeffs, 5.75e6, 19.2e6 )
+    duc_coeffs = filter.firdes.low_pass( 1, 19.2e6, 9e6, 1e6, filter.firdes.WIN_HAMMING )
+    duc = filter.freq_xlating_fir_filter_ccf( 1 duc_coeffs, 5.75e6, 19.2e6 )
 
-    c2f = gr.complex_to_float()
-    file = gr.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_2")
+    c2f = blocks.complex_to_float()
+    file = blocks.file_sink(gr.sizeof_float,"/tmp/atsc_pipe_2")
 
     tb.connect( src0, duc, c2f, file )
 
diff --git a/gr-atsc/swig/CMakeLists.txt b/gr-atsc/swig/CMakeLists.txt
new file mode 100644
index 0000000000..71039f80aa
--- /dev/null
+++ b/gr-atsc/swig/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Copyright 2013 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 swig generation
+########################################################################
+include(GrPython)
+include(GrSwig)
+
+set(GR_SWIG_INCLUDE_DIRS
+    ${GR_ATSC_INCLUDE_DIRS}
+    ${GR_FILTER_INCLUDE_DIRS}
+    ${GR_BLOCKS_INCLUDE_DIRS}
+    ${GR_ANALOG_INCLUDE_DIRS}
+    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${FFTW3F_INCLUDE_DIRS}
+)
+
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+set(GR_SWIG_LIBRARIES gnuradio-atsc gnuradio-fft)
+
+GR_SWIG_MAKE(atsc_swig atsc_swig.i)
+
+GR_SWIG_INSTALL(
+    TARGETS atsc_swig
+    DESTINATION ${GR_PYTHON_DIR}/gnuradio/atsc
+    COMPONENT "atsc_python"
+)
+
+install(
+    FILES
+    atsc_swig.i
+    ${CMAKE_CURRENT_BINARY_DIR}/atsc_swig_doc.i
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
+    COMPONENT "atsc_swig"
+)
diff --git a/gr-atsc/src/lib/atsc.i b/gr-atsc/swig/atsc_swig.i
index 6b83a23153..4711d497eb 100644
--- a/gr-atsc/src/lib/atsc.i
+++ b/gr-atsc/swig/atsc_swig.i
@@ -26,26 +26,26 @@
 %include "atsc_swig_doc.i"
 
 %{
-#include <atsc_randomizer.h>
-#include <atsc_derandomizer.h>
-#include <atsc_rs_encoder.h>
-#include <atsc_rs_decoder.h>
-#include <atsc_interleaver.h>
-#include <atsc_deinterleaver.h>
-#include <atsc_trellis_encoder.h>
-#include <atsc_viterbi_decoder.h>
-#include <atsc_ds_to_softds.h>
-#include <atsc_field_sync_mux.h>
-#include <atsc_field_sync_demux.h>
-#include <atsc_equalizer.h>
-#include <atsc_fs_checker.h>
-#include <atsc_bit_timing_loop.h>
-#include <atsc_fpll.h>
-#include <atsc_depad.h>
-#include <atsc_pad.h>
+#include <atsc/randomizer.h>
+#include <atsc/derandomizer.h>
+#include <atsc/rs_encoder.h>
+#include <atsc/rs_decoder.h>
+#include <atsc/interleaver.h>
+#include <atsc/deinterleaver.h>
+#include <atsc/trellis_encoder.h>
+#include <atsc/viterbi_decoder.h>
+#include <atsc/ds_to_softds.h>
+#include <atsc/field_sync_mux.h>
+#include <atsc/field_sync_demux.h>
+#include <atsc/equalizer.h>
+#include <atsc/fs_checker.h>
+#include <atsc/bit_timing_loop.h>
+#include <atsc/fpll.h>
+#include <atsc/depad.h>
+#include <atsc/pad.h>
 %}
 
-%include "atsc_consts.h"
+%include "atsc/consts.h"
 
 %constant int sizeof_atsc_mpeg_packet = sizeof(atsc_mpeg_packet);
 %constant int sizeof_atsc_mpeg_packet_no_sync = sizeof(atsc_mpeg_packet_no_sync);