diff --git a/q65w/CMakeLists.txt b/q65w/CMakeLists.txt
index c36921664..4a326e981 100644
--- a/q65w/CMakeLists.txt
+++ b/q65w/CMakeLists.txt
@@ -33,7 +33,7 @@ set_property (SOURCE ${q65w_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS
 set_property (SOURCE ${q65w_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/wsjtx_config.h)
 
 # build the subdirectories
-add_subdirectory (libm65)
+add_subdirectory (libq65)
 
 # UI generation
 qt5_wrap_ui (q65w_GENUISRCS ${q65w_UISRCS})
diff --git a/q65w/libm65/CMakeLists.txt b/q65w/libq65/CMakeLists.txt
similarity index 67%
rename from q65w/libm65/CMakeLists.txt
rename to q65w/libq65/CMakeLists.txt
index e23aa85ad..015cd3253 100644
--- a/q65w/libm65/CMakeLists.txt
+++ b/q65w/libq65/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (libm65_FSRCS
+set (libq65_FSRCS
 # Modules come first:
   wideband_sync.f90
 
@@ -33,21 +33,21 @@ set (libm65_FSRCS
   f77_wisdom.f
   )
 
-set (libm65_CXXSRCS
+set (libq65_CXXSRCS
   ipcomm.cpp
   )
 
-set (libm65_C_and_CXXSRCS
-  ${libm65_CSRCS}
-  ${libm65_CXXSRCS}
+set (libq65_C_and_CXXSRCS
+  ${libq65_CSRCS}
+  ${libq65_CXXSRCS}
   )
-set_property (SOURCE ${libm65_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -include wsjtx_config.h")
-set_property (SOURCE ${libm65_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/wsjtx_config.h)
+set_property (SOURCE ${libq65_C_and_CXXSRCS} APPEND_STRING PROPERTY COMPILE_FLAGS " -include wsjtx_config.h")
+set_property (SOURCE ${libq65_C_and_CXXSRCS} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_BINARY_DIR}/wsjtx_config.h)
 
 
 #
 # build our targets
 #
-add_library (m65impl STATIC ${libm65_FSRCS} ${libm65_CSRCS} ${libm65_CXXSRCS})
+add_library (m65impl STATIC ${libq65_FSRCS} ${libq65_CSRCS} ${libq65_CXXSRCS})
 target_link_libraries (m65impl wsjt_fort wsjt_cxx Qt5::Core)
 
diff --git a/q65w/libm65/astro.f90 b/q65w/libq65/astro.f90
similarity index 100%
rename from q65w/libm65/astro.f90
rename to q65w/libq65/astro.f90
diff --git a/q65w/libm65/astro0.f90 b/q65w/libq65/astro0.f90
similarity index 100%
rename from q65w/libm65/astro0.f90
rename to q65w/libq65/astro0.f90
diff --git a/q65w/libm65/astrosub.f90 b/q65w/libq65/astrosub.f90
similarity index 100%
rename from q65w/libm65/astrosub.f90
rename to q65w/libq65/astrosub.f90
diff --git a/q65w/libm65/dcoord.f90 b/q65w/libq65/dcoord.f90
similarity index 100%
rename from q65w/libm65/dcoord.f90
rename to q65w/libq65/dcoord.f90
diff --git a/q65w/libm65/decode0.f90 b/q65w/libq65/decode0.f90
similarity index 100%
rename from q65w/libm65/decode0.f90
rename to q65w/libq65/decode0.f90
diff --git a/q65w/libm65/dot.f90 b/q65w/libq65/dot.f90
similarity index 100%
rename from q65w/libm65/dot.f90
rename to q65w/libq65/dot.f90
diff --git a/q65w/libm65/f77_wisdom.f b/q65w/libq65/f77_wisdom.f
similarity index 100%
rename from q65w/libm65/f77_wisdom.f
rename to q65w/libq65/f77_wisdom.f
diff --git a/q65w/libm65/fchisq0.f90 b/q65w/libq65/fchisq0.f90
similarity index 100%
rename from q65w/libm65/fchisq0.f90
rename to q65w/libq65/fchisq0.f90
diff --git a/q65w/libm65/fftw3.f b/q65w/libq65/fftw3.f
similarity index 100%
rename from q65w/libm65/fftw3.f
rename to q65w/libq65/fftw3.f
diff --git a/q65w/libm65/fftw3.f90 b/q65w/libq65/fftw3.f90
similarity index 100%
rename from q65w/libm65/fftw3.f90
rename to q65w/libq65/fftw3.f90
diff --git a/q65w/libm65/filbig.f90 b/q65w/libq65/filbig.f90
similarity index 100%
rename from q65w/libm65/filbig.f90
rename to q65w/libq65/filbig.f90
diff --git a/q65w/libm65/four2a.f90 b/q65w/libq65/four2a.f90
similarity index 100%
rename from q65w/libm65/four2a.f90
rename to q65w/libq65/four2a.f90
diff --git a/q65w/libm65/ftninit.f90 b/q65w/libq65/ftninit.f90
similarity index 100%
rename from q65w/libm65/ftninit.f90
rename to q65w/libq65/ftninit.f90
diff --git a/q65w/libm65/ftnquit.f90 b/q65w/libq65/ftnquit.f90
similarity index 100%
rename from q65w/libm65/ftnquit.f90
rename to q65w/libq65/ftnquit.f90
diff --git a/q65w/libm65/geocentric.f90 b/q65w/libq65/geocentric.f90
similarity index 100%
rename from q65w/libm65/geocentric.f90
rename to q65w/libq65/geocentric.f90
diff --git a/q65w/libm65/getdphi.f90 b/q65w/libq65/getdphi.f90
similarity index 100%
rename from q65w/libm65/getdphi.f90
rename to q65w/libq65/getdphi.f90
diff --git a/q65w/libm65/grid2deg.f90 b/q65w/libq65/grid2deg.f90
similarity index 100%
rename from q65w/libm65/grid2deg.f90
rename to q65w/libq65/grid2deg.f90
diff --git a/q65w/libm65/indexx.f90 b/q65w/libq65/indexx.f90
similarity index 100%
rename from q65w/libm65/indexx.f90
rename to q65w/libq65/indexx.f90
diff --git a/q65w/libm65/ipcomm.cpp b/q65w/libq65/ipcomm.cpp
similarity index 100%
rename from q65w/libm65/ipcomm.cpp
rename to q65w/libq65/ipcomm.cpp
diff --git a/q65w/libm65/lorentzian.f90 b/q65w/libq65/lorentzian.f90
similarity index 100%
rename from q65w/libm65/lorentzian.f90
rename to q65w/libq65/lorentzian.f90
diff --git a/q65w/libm65/moon2.f90 b/q65w/libq65/moon2.f90
similarity index 100%
rename from q65w/libm65/moon2.f90
rename to q65w/libq65/moon2.f90
diff --git a/q65w/libm65/moondop.f90 b/q65w/libq65/moondop.f90
similarity index 100%
rename from q65w/libm65/moondop.f90
rename to q65w/libq65/moondop.f90
diff --git a/q65w/libm65/msgs.txt b/q65w/libq65/msgs.txt
similarity index 100%
rename from q65w/libm65/msgs.txt
rename to q65w/libq65/msgs.txt
diff --git a/q65w/libm65/njunk.f90 b/q65w/libq65/njunk.f90
similarity index 100%
rename from q65w/libm65/njunk.f90
rename to q65w/libq65/njunk.f90
diff --git a/q65w/libm65/pfx.f90 b/q65w/libq65/pfx.f90
similarity index 100%
rename from q65w/libm65/pfx.f90
rename to q65w/libq65/pfx.f90
diff --git a/q65w/libm65/q65b.f90 b/q65w/libq65/q65b.f90
similarity index 100%
rename from q65w/libm65/q65b.f90
rename to q65w/libq65/q65b.f90
diff --git a/q65w/libm65/q65c.f90 b/q65w/libq65/q65c.f90
similarity index 100%
rename from q65w/libm65/q65c.f90
rename to q65w/libq65/q65c.f90
diff --git a/q65w/libm65/q65wa.f90 b/q65w/libq65/q65wa.f90
similarity index 100%
rename from q65w/libm65/q65wa.f90
rename to q65w/libq65/q65wa.f90
diff --git a/q65w/libm65/recvpkt.f90 b/q65w/libq65/recvpkt.f90
similarity index 100%
rename from q65w/libm65/recvpkt.f90
rename to q65w/libq65/recvpkt.f90
diff --git a/q65w/libm65/rfile3a.f90 b/q65w/libq65/rfile3a.f90
similarity index 100%
rename from q65w/libm65/rfile3a.f90
rename to q65w/libq65/rfile3a.f90
diff --git a/q65w/libm65/s3avg.f90 b/q65w/libq65/s3avg.f90
similarity index 100%
rename from q65w/libm65/s3avg.f90
rename to q65w/libq65/s3avg.f90
diff --git a/q65w/libm65/set.f90 b/q65w/libq65/set.f90
similarity index 100%
rename from q65w/libm65/set.f90
rename to q65w/libq65/set.f90
diff --git a/q65w/libm65/shell.f90 b/q65w/libq65/shell.f90
similarity index 100%
rename from q65w/libm65/shell.f90
rename to q65w/libq65/shell.f90
diff --git a/q65w/libm65/sleep_msec.f90 b/q65w/libq65/sleep_msec.f90
similarity index 100%
rename from q65w/libm65/sleep_msec.f90
rename to q65w/libq65/sleep_msec.f90
diff --git a/q65w/libm65/smo.f90 b/q65w/libq65/smo.f90
similarity index 100%
rename from q65w/libm65/smo.f90
rename to q65w/libq65/smo.f90
diff --git a/q65w/libm65/sort.f90 b/q65w/libq65/sort.f90
similarity index 100%
rename from q65w/libm65/sort.f90
rename to q65w/libq65/sort.f90
diff --git a/q65w/libm65/ssort.f b/q65w/libq65/ssort.f
similarity index 100%
rename from q65w/libm65/ssort.f
rename to q65w/libq65/ssort.f
diff --git a/q65w/libm65/sun.f90 b/q65w/libq65/sun.f90
similarity index 100%
rename from q65w/libm65/sun.f90
rename to q65w/libq65/sun.f90
diff --git a/q65w/libm65/symspec.f90 b/q65w/libq65/symspec.f90
similarity index 100%
rename from q65w/libm65/symspec.f90
rename to q65w/libq65/symspec.f90
diff --git a/q65w/libm65/synctest.f90 b/q65w/libq65/synctest.f90
similarity index 100%
rename from q65w/libm65/synctest.f90
rename to q65w/libq65/synctest.f90
diff --git a/q65w/libm65/synctst.f90 b/q65w/libq65/synctst.f90
similarity index 100%
rename from q65w/libm65/synctst.f90
rename to q65w/libq65/synctst.f90
diff --git a/q65w/libm65/synctst2.f90 b/q65w/libq65/synctst2.f90
similarity index 100%
rename from q65w/libm65/synctst2.f90
rename to q65w/libq65/synctst2.f90
diff --git a/q65w/libm65/tastro.f90 b/q65w/libq65/tastro.f90
similarity index 100%
rename from q65w/libm65/tastro.f90
rename to q65w/libq65/tastro.f90
diff --git a/q65w/libm65/timf2.f90 b/q65w/libq65/timf2.f90
similarity index 100%
rename from q65w/libm65/timf2.f90
rename to q65w/libq65/timf2.f90
diff --git a/q65w/libm65/tm2.f90 b/q65w/libq65/tm2.f90
similarity index 100%
rename from q65w/libm65/tm2.f90
rename to q65w/libq65/tm2.f90
diff --git a/q65w/libm65/toxyz.f90 b/q65w/libq65/toxyz.f90
similarity index 100%
rename from q65w/libm65/toxyz.f90
rename to q65w/libq65/toxyz.f90
diff --git a/q65w/libm65/twkfreq.f90 b/q65w/libq65/twkfreq.f90
similarity index 100%
rename from q65w/libm65/twkfreq.f90
rename to q65w/libq65/twkfreq.f90
diff --git a/q65w/libm65/twkfreq_xy.f90 b/q65w/libq65/twkfreq_xy.f90
similarity index 100%
rename from q65w/libm65/twkfreq_xy.f90
rename to q65w/libq65/twkfreq_xy.f90
diff --git a/q65w/libm65/txpol.f90 b/q65w/libq65/txpol.f90
similarity index 100%
rename from q65w/libm65/txpol.f90
rename to q65w/libq65/txpol.f90
diff --git a/q65w/libm65/wideband_sync.f90 b/q65w/libq65/wideband_sync.f90
similarity index 100%
rename from q65w/libm65/wideband_sync.f90
rename to q65w/libq65/wideband_sync.f90
diff --git a/q65w/libm65/zplot.f90 b/q65w/libq65/zplot.f90
similarity index 100%
rename from q65w/libm65/zplot.f90
rename to q65w/libq65/zplot.f90