31 files changed, 13 insertions, 13 deletions
diff --git a/gr-dtv/lib/CMakeLists.txt b/gr-dtv/lib/CMakeLists.txt
index 23d6a98a0f..9227f24c96 100644
--- a/gr-dtv/lib/CMakeLists.txt
+++ b/gr-dtv/lib/CMakeLists.txt
@@ -42,7 +42,7 @@ endif(ENABLE_GR_CTRLPORT)
 # http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
 ########################################################################
 if(NOT CMAKE_CROSSCOMPILING)
-  add_executable(atsc_viterbi_gen atsc_viterbi_gen.cc)
+  add_executable(atsc_viterbi_gen atsc/atsc_viterbi_gen.cc)
   export(TARGETS atsc_viterbi_gen APPEND FILE ${EXPORT_FILE})
 endif()
 
@@ -59,18 +59,18 @@ add_custom_command(
 ########################################################################
 list(APPEND dtv_sources
   ${atsc_viterbi_mux_cc}
-  atsc_deinterleaver_impl.cc
-  atsc_depad_impl.cc
-  atsc_derandomizer_impl.cc
-  atsc_equalizer_impl.cc
-  atsc_fpll_impl.cc
-  atsc_fs_checker_impl.cc
-  atsc_randomize.cc
-  atsc_rs_decoder_impl.cc
-  atsc_sync_impl.cc
-  atsc_fake_single_viterbi.cc
-  atsc_single_viterbi.cc
-  atsc_viterbi_decoder_impl.cc
+  atsc/atsc_deinterleaver_impl.cc
+  atsc/atsc_depad_impl.cc
+  atsc/atsc_derandomizer_impl.cc
+  atsc/atsc_equalizer_impl.cc
+  atsc/atsc_fpll_impl.cc
+  atsc/atsc_fs_checker_impl.cc
+  atsc/atsc_randomize.cc
+  atsc/atsc_rs_decoder_impl.cc
+  atsc/atsc_sync_impl.cc
+  atsc/atsc_fake_single_viterbi.cc
+  atsc/atsc_single_viterbi.cc
+  atsc/atsc_viterbi_decoder_impl.cc
 )
 
 if(ENABLE_GR_CTRLPORT)
diff --git a/gr-dtv/lib/atsc_deinterleaver_impl.cc b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.cc
index 7b2001aacb..7b2001aacb 100644
--- a/gr-dtv/lib/atsc_deinterleaver_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.cc
diff --git a/gr-dtv/lib/atsc_deinterleaver_impl.h b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.h
index 75eb7e877d..75eb7e877d 100644
--- a/gr-dtv/lib/atsc_deinterleaver_impl.h
+++ b/gr-dtv/lib/atsc/atsc_deinterleaver_impl.h
diff --git a/gr-dtv/lib/atsc_depad_impl.cc b/gr-dtv/lib/atsc/atsc_depad_impl.cc
index e1172e630c..e1172e630c 100644
--- a/gr-dtv/lib/atsc_depad_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_depad_impl.cc
diff --git a/gr-dtv/lib/atsc_depad_impl.h b/gr-dtv/lib/atsc/atsc_depad_impl.h
index d29b1cfe9e..d29b1cfe9e 100644
--- a/gr-dtv/lib/atsc_depad_impl.h
+++ b/gr-dtv/lib/atsc/atsc_depad_impl.h
diff --git a/gr-dtv/lib/atsc_derandomizer_impl.cc b/gr-dtv/lib/atsc/atsc_derandomizer_impl.cc
index 364713f7b5..364713f7b5 100644
--- a/gr-dtv/lib/atsc_derandomizer_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_derandomizer_impl.cc
diff --git a/gr-dtv/lib/atsc_derandomizer_impl.h b/gr-dtv/lib/atsc/atsc_derandomizer_impl.h
index a307a51d86..a307a51d86 100644
--- a/gr-dtv/lib/atsc_derandomizer_impl.h
+++ b/gr-dtv/lib/atsc/atsc_derandomizer_impl.h
diff --git a/gr-dtv/lib/atsc_equalizer_impl.cc b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
index c804be6dc7..c804be6dc7 100644
--- a/gr-dtv/lib/atsc_equalizer_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.cc
diff --git a/gr-dtv/lib/atsc_equalizer_impl.h b/gr-dtv/lib/atsc/atsc_equalizer_impl.h
index 6ff89ca646..6ff89ca646 100644
--- a/gr-dtv/lib/atsc_equalizer_impl.h
+++ b/gr-dtv/lib/atsc/atsc_equalizer_impl.h
diff --git a/gr-dtv/lib/atsc_fake_single_viterbi.cc b/gr-dtv/lib/atsc/atsc_fake_single_viterbi.cc
index ffe410292e..ffe410292e 100644
--- a/gr-dtv/lib/atsc_fake_single_viterbi.cc
+++ b/gr-dtv/lib/atsc/atsc_fake_single_viterbi.cc
diff --git a/gr-dtv/lib/atsc_fake_single_viterbi.h b/gr-dtv/lib/atsc/atsc_fake_single_viterbi.h
index 9ca546a6ab..9ca546a6ab 100644
--- a/gr-dtv/lib/atsc_fake_single_viterbi.h
+++ b/gr-dtv/lib/atsc/atsc_fake_single_viterbi.h
diff --git a/gr-dtv/lib/atsc_fpll_impl.cc b/gr-dtv/lib/atsc/atsc_fpll_impl.cc
index b211f80d6e..b211f80d6e 100644
--- a/gr-dtv/lib/atsc_fpll_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_fpll_impl.cc
diff --git a/gr-dtv/lib/atsc_fpll_impl.h b/gr-dtv/lib/atsc/atsc_fpll_impl.h
index e06fc09cc5..e06fc09cc5 100644
--- a/gr-dtv/lib/atsc_fpll_impl.h
+++ b/gr-dtv/lib/atsc/atsc_fpll_impl.h
diff --git a/gr-dtv/lib/atsc_fs_checker_impl.cc b/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc
index 3a39bc794b..3a39bc794b 100644
--- a/gr-dtv/lib/atsc_fs_checker_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_fs_checker_impl.cc
diff --git a/gr-dtv/lib/atsc_fs_checker_impl.h b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h
index 1210ae5830..1210ae5830 100644
--- a/gr-dtv/lib/atsc_fs_checker_impl.h
+++ b/gr-dtv/lib/atsc/atsc_fs_checker_impl.h
diff --git a/gr-dtv/lib/atsc_interleaver_fifo.h b/gr-dtv/lib/atsc/atsc_interleaver_fifo.h
index 0d40389c74..0d40389c74 100644
--- a/gr-dtv/lib/atsc_interleaver_fifo.h
+++ b/gr-dtv/lib/atsc/atsc_interleaver_fifo.h
diff --git a/gr-dtv/lib/atsc_pnXXX_impl.h b/gr-dtv/lib/atsc/atsc_pnXXX_impl.h
index d4b86dcdbb..d4b86dcdbb 100644
--- a/gr-dtv/lib/atsc_pnXXX_impl.h
+++ b/gr-dtv/lib/atsc/atsc_pnXXX_impl.h
diff --git a/gr-dtv/lib/atsc_randomize.cc b/gr-dtv/lib/atsc/atsc_randomize.cc
index 769b08587a..769b08587a 100644
--- a/gr-dtv/lib/atsc_randomize.cc
+++ b/gr-dtv/lib/atsc/atsc_randomize.cc
diff --git a/gr-dtv/lib/atsc_randomize.h b/gr-dtv/lib/atsc/atsc_randomize.h
index 0903240f48..0903240f48 100644
--- a/gr-dtv/lib/atsc_randomize.h
+++ b/gr-dtv/lib/atsc/atsc_randomize.h
diff --git a/gr-dtv/lib/atsc_rs_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc
index 7fb6541872..7fb6541872 100644
--- a/gr-dtv/lib/atsc_rs_decoder_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.cc
diff --git a/gr-dtv/lib/atsc_rs_decoder_impl.h b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
index 57460128dc..57460128dc 100644
--- a/gr-dtv/lib/atsc_rs_decoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_rs_decoder_impl.h
diff --git a/gr-dtv/lib/atsc_single_viterbi.cc b/gr-dtv/lib/atsc/atsc_single_viterbi.cc
index 385940e453..385940e453 100644
--- a/gr-dtv/lib/atsc_single_viterbi.cc
+++ b/gr-dtv/lib/atsc/atsc_single_viterbi.cc
diff --git a/gr-dtv/lib/atsc_single_viterbi.h b/gr-dtv/lib/atsc/atsc_single_viterbi.h
index 3c756c7690..3c756c7690 100644
--- a/gr-dtv/lib/atsc_single_viterbi.h
+++ b/gr-dtv/lib/atsc/atsc_single_viterbi.h
diff --git a/gr-dtv/lib/atsc_syminfo_impl.h b/gr-dtv/lib/atsc/atsc_syminfo_impl.h
index 4a5008e5f8..4a5008e5f8 100644
--- a/gr-dtv/lib/atsc_syminfo_impl.h
+++ b/gr-dtv/lib/atsc/atsc_syminfo_impl.h
diff --git a/gr-dtv/lib/atsc_sync_impl.cc b/gr-dtv/lib/atsc/atsc_sync_impl.cc
index ec46d6b8d1..ec46d6b8d1 100644
--- a/gr-dtv/lib/atsc_sync_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_sync_impl.cc
diff --git a/gr-dtv/lib/atsc_sync_impl.h b/gr-dtv/lib/atsc/atsc_sync_impl.h
index eb0ad17286..eb0ad17286 100644
--- a/gr-dtv/lib/atsc_sync_impl.h
+++ b/gr-dtv/lib/atsc/atsc_sync_impl.h
diff --git a/gr-dtv/lib/atsc_types.h b/gr-dtv/lib/atsc/atsc_types.h
index 7c02d0adf2..7c02d0adf2 100644
--- a/gr-dtv/lib/atsc_types.h
+++ b/gr-dtv/lib/atsc/atsc_types.h
diff --git a/gr-dtv/lib/atsc_viterbi_decoder_impl.cc b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc
index 8e9cbc02b7..8e9cbc02b7 100644
--- a/gr-dtv/lib/atsc_viterbi_decoder_impl.cc
+++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc
diff --git a/gr-dtv/lib/atsc_viterbi_decoder_impl.h b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
index b4fbbd1033..b4fbbd1033 100644
--- a/gr-dtv/lib/atsc_viterbi_decoder_impl.h
+++ b/gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.h
diff --git a/gr-dtv/lib/atsc_viterbi_gen.cc b/gr-dtv/lib/atsc/atsc_viterbi_gen.cc
index bff3c47736..bff3c47736 100644
--- a/gr-dtv/lib/atsc_viterbi_gen.cc
+++ b/gr-dtv/lib/atsc/atsc_viterbi_gen.cc
diff --git a/gr-dtv/lib/interleaver_fifo.h b/gr-dtv/lib/atsc/interleaver_fifo.h
index c1e6e3a1f0..c1e6e3a1f0 100644
--- a/gr-dtv/lib/interleaver_fifo.h
+++ b/gr-dtv/lib/atsc/interleaver_fifo.h