diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7cd7ae83b..68d97f99d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -415,6 +415,7 @@ set (wsjt_FSRCS
   lib/decode65a.f90
   lib/decode65b.f90
   lib/decode9w.f90
+  lib/ft8/decode174_91.f90
   lib/decoder.f90
   lib/deep4.f90
   lib/deg2grid.f90
@@ -426,7 +427,6 @@ set (wsjt_FSRCS
   lib/encode4.f90
   lib/encode_msk40.f90
   lib/encode_128_90.f90
-  lib/ft8/encode174.f90
   lib/ft8/encode174_91.f90
   lib/ft8/encode174_91_nocrc.f90
   lib/entail.f90
@@ -483,6 +483,7 @@ set (wsjt_FSRCS
   lib/ft8/genft8refsig.f90
   lib/genwspr.f90
   lib/geodist.f90
+  lib/ft8/get_crc14.f90
   lib/getlags.f90
   lib/getmet4.f90
   lib/ft8/get_spectrum_baseline.f90
@@ -596,48 +597,6 @@ set (wsjt_FSRCS
   lib/wqencode.f90
   lib/wspr_downsample.f90
   lib/zplot9.f90
-  lib/fsk4hf/wsprcpmsim.f90
-  lib/fsk4hf/wsprcpm_wav.f90
-  lib/fsk4hf/wsprcpmd.f90
-  lib/fsk4hf/bpdecode204.f90
-  lib/fsk4hf/osd204.f90
-  lib/fsk4hf/genwsprcpm.f90
-  lib/fsk4hf/encode204.f90
-  lib/fsk4hf/decode174_74.f90
-  lib/ft8/decode174_91.f90
-  lib/fsk4hf/decode240_101.f90
-  lib/fsk4hf/decode280_101.f90
-  lib/fsk4hf/ldpcsim174_91.f90
-  lib/fsk4hf/ldpcsim174_74.f90
-  lib/fsk4hf/ldpcsim240_101.f90
-  lib/fsk4hf/ldpcsim280_101.f90
-  lib/fsk4hf/get_crc14.f90
-  lib/fsk4hf/get_crc24.f90
-  lib/fsk4hf/encode174_74.f90
-  lib/fsk4hf/encode240_101.f90
-  lib/fsk4hf/encode280_101.f90
-  lib/fsk4hf/bpdecode174_74.f90
-  lib/fsk4hf/bpdecode240_101.f90
-  lib/fsk4hf/bpdecode280_101.f90
-  lib/fsk4hf/osd174_74.f90
-  lib/fsk4hf/osd240_101.f90
-  lib/fsk4hf/osd280_101.f90
-  lib/fsk4hf/wspr4sim.f90
-  lib/fsk4hf/genwspr4.f90
-  lib/fsk4hf/gen_wspr4wave.f90
-  lib/fsk4hf/wspr4d.f90
-  lib/fsk4hf/get_wspr4_bitmetrics.f90
-  lib/fsk4hf/get_ft280_bitmetrics.f90
-  lib/fsk4hf/ft4slowsim.f90
-  lib/fsk4hf/ft280sim.f90
-  lib/fsk4hf/genft4slow.f90
-  lib/fsk4hf/genft280.f90
-  lib/fsk4hf/decode240_101.f90
-  lib/fsk4hf/decode280_101.f90
-  lib/fsk4hf/ft4sd.f90
-  lib/fsk4hf/ft280d.f90
-  lib/fsk4hf/get_ft4s_bitmetrics.f90
-  lib/fsk4hf/get_ft280_bitmetrics.f90
   )
 
 # temporary workaround for a gfortran v7.3 ICE on Fedora 27 64-bit
@@ -1375,42 +1334,6 @@ target_link_libraries (ft4sim_mult wsjt_fort wsjt_cxx)
 add_executable (record_time_signal Audio/tools/record_time_signal.cpp)
 target_link_libraries (record_time_signal wsjt_cxx wsjt_qtmm wsjt_qt)
 
-add_executable (wsprcpmsim lib/fsk4hf/wsprcpmsim.f90 wsjtx.rc)
-target_link_libraries (wsprcpmsim wsjt_fort wsjt_cxx)
-
-add_executable (wsprcpmd lib/fsk4hf/wsprcpmd.f90 wsjtx.rc)
-target_link_libraries (wsprcpmd wsjt_fort wsjt_cxx)
-
-add_executable (ldpcsim174_91 lib/fsk4hf/ldpcsim174_91.f90 wsjtx.rc)
-target_link_libraries (ldpcsim174_91 wsjt_fort wsjt_cxx)
-
-add_executable (ldpcsim174_74 lib/fsk4hf/ldpcsim174_74.f90 wsjtx.rc)
-target_link_libraries (ldpcsim174_74 wsjt_fort wsjt_cxx)
-
-add_executable (ldpcsim240_101 lib/fsk4hf/ldpcsim240_101.f90 wsjtx.rc)
-target_link_libraries (ldpcsim240_101 wsjt_fort wsjt_cxx)
-
-add_executable (ldpcsim280_101 lib/fsk4hf/ldpcsim280_101.f90 wsjtx.rc)
-target_link_libraries (ldpcsim280_101 wsjt_fort wsjt_cxx)
-
-add_executable (wspr4sim lib/fsk4hf/wspr4sim.f90 wsjtx.rc)
-target_link_libraries (wspr4sim wsjt_fort wsjt_cxx)
-
-add_executable (wspr4d lib/fsk4hf/wspr4d.f90 wsjtx.rc)
-target_link_libraries (wspr4d wsjt_fort wsjt_cxx)
-
-add_executable (ft4slowsim lib/fsk4hf/ft4slowsim.f90 wsjtx.rc)
-target_link_libraries (ft4slowsim wsjt_fort wsjt_cxx)
-
-add_executable (ft280sim lib/fsk4hf/ft280sim.f90 wsjtx.rc)
-target_link_libraries (ft280sim wsjt_fort wsjt_cxx)
-
-add_executable (ft4sd lib/fsk4hf/ft4sd.f90 wsjtx.rc)
-target_link_libraries (ft4sd wsjt_fort wsjt_cxx)
-
-add_executable (ft280d lib/fsk4hf/ft280d.f90 wsjtx.rc)
-target_link_libraries (ft280d wsjt_fort wsjt_cxx)
-
 endif(WSJT_BUILD_UTILS)
 
 # build the main application
diff --git a/lib/fsk4hf/get_crc14.f90 b/lib/ft8/get_crc14.f90
similarity index 100%
rename from lib/fsk4hf/get_crc14.f90
rename to lib/ft8/get_crc14.f90
diff --git a/lib/fsk4hf/ldpcsim174_91.f90 b/lib/ft8/ldpcsim174_91.f90
similarity index 100%
rename from lib/fsk4hf/ldpcsim174_91.f90
rename to lib/ft8/ldpcsim174_91.f90