diff --git a/libm65/Makefile.MinGW b/lib/Makefile.MinGW
similarity index 100%
rename from libm65/Makefile.MinGW
rename to lib/Makefile.MinGW
diff --git a/libm65/Makefile.linux b/lib/Makefile.linux
similarity index 100%
rename from libm65/Makefile.linux
rename to lib/Makefile.linux
diff --git a/libm65/analytic.f90 b/lib/analytic.f90
similarity index 100%
rename from libm65/analytic.f90
rename to lib/analytic.f90
diff --git a/libm65/bpskmetrics.dat b/lib/bpskmetrics.dat
similarity index 100%
rename from libm65/bpskmetrics.dat
rename to lib/bpskmetrics.dat
diff --git a/libm65/conv232.f90 b/lib/conv232.f90
similarity index 100%
rename from libm65/conv232.f90
rename to lib/conv232.f90
diff --git a/libm65/cutil.c b/lib/cutil.c
similarity index 100%
rename from libm65/cutil.c
rename to lib/cutil.c
diff --git a/libm65/db.f90 b/lib/db.f90
similarity index 100%
rename from libm65/db.f90
rename to lib/db.f90
diff --git a/libm65/decode0.f90 b/lib/decode0.f90
similarity index 100%
rename from libm65/decode0.f90
rename to lib/decode0.f90
diff --git a/libm65/decode9.f90 b/lib/decode9.f90
similarity index 100%
rename from libm65/decode9.f90
rename to lib/decode9.f90
diff --git a/libm65/decode_rs.c b/lib/decode_rs.c
similarity index 100%
rename from libm65/decode_rs.c
rename to lib/decode_rs.c
diff --git a/libm65/deg2grid.f b/lib/deg2grid.f
similarity index 100%
rename from libm65/deg2grid.f
rename to lib/deg2grid.f
diff --git a/libm65/encode232.f90 b/lib/encode232.f90
similarity index 100%
rename from libm65/encode232.f90
rename to lib/encode232.f90
diff --git a/libm65/encode_rs.c b/lib/encode_rs.c
similarity index 100%
rename from libm65/encode_rs.c
rename to lib/encode_rs.c
diff --git a/libm65/entail.f90 b/lib/entail.f90
similarity index 100%
rename from libm65/entail.f90
rename to lib/entail.f90
diff --git a/libm65/f77_wisdom.f b/lib/f77_wisdom.f
similarity index 100%
rename from libm65/f77_wisdom.f
rename to lib/f77_wisdom.f
diff --git a/libm65/fano232.f90 b/lib/fano232.f90
similarity index 100%
rename from libm65/fano232.f90
rename to lib/fano232.f90
diff --git a/libm65/fftw3.f b/lib/fftw3.f
similarity index 100%
rename from libm65/fftw3.f
rename to lib/fftw3.f
diff --git a/libm65/fil61.f90 b/lib/fil61.f90
similarity index 100%
rename from libm65/fil61.f90
rename to lib/fil61.f90
diff --git a/libm65/four2a.f90 b/lib/four2a.f90
similarity index 100%
rename from libm65/four2a.f90
rename to lib/four2a.f90
diff --git a/libm65/ftninit.f90 b/lib/ftninit.f90
similarity index 100%
rename from libm65/ftninit.f90
rename to lib/ftninit.f90
diff --git a/libm65/ftnquit.f90 b/lib/ftnquit.f90
similarity index 100%
rename from libm65/ftnquit.f90
rename to lib/ftnquit.f90
diff --git a/libm65/genjt8.f90 b/lib/genjt8.f90
similarity index 100%
rename from libm65/genjt8.f90
rename to lib/genjt8.f90
diff --git a/libm65/genjt9.f90 b/lib/genjt9.f90
similarity index 100%
rename from libm65/genjt9.f90
rename to lib/genjt9.f90
diff --git a/libm65/genjtms3a.f90 b/lib/genjtms3a.f90
similarity index 100%
rename from libm65/genjtms3a.f90
rename to lib/genjtms3a.f90
diff --git a/libm65/genmsk.f90 b/lib/genmsk.f90
similarity index 100%
rename from libm65/genmsk.f90
rename to lib/genmsk.f90
diff --git a/libm65/getpfx1.f b/lib/getpfx1.f
similarity index 100%
rename from libm65/getpfx1.f
rename to lib/getpfx1.f
diff --git a/libm65/getpfx2.f b/lib/getpfx2.f
similarity index 100%
rename from libm65/getpfx2.f
rename to lib/getpfx2.f
diff --git a/libm65/gran.c b/lib/gran.c
similarity index 100%
rename from libm65/gran.c
rename to lib/gran.c
diff --git a/libm65/graycode.f90 b/lib/graycode.f90
similarity index 100%
rename from libm65/graycode.f90
rename to lib/graycode.f90
diff --git a/libm65/grid2deg.f b/lib/grid2deg.f
similarity index 100%
rename from libm65/grid2deg.f
rename to lib/grid2deg.f
diff --git a/libm65/grid2k.f b/lib/grid2k.f
similarity index 100%
rename from libm65/grid2k.f
rename to lib/grid2k.f
diff --git a/libm65/igray.c b/lib/igray.c
similarity index 100%
rename from libm65/igray.c
rename to lib/igray.c
diff --git a/libm65/indexx.f b/lib/indexx.f
similarity index 100%
rename from libm65/indexx.f
rename to lib/indexx.f
diff --git a/libm65/init_rs.c b/lib/init_rs.c
similarity index 100%
rename from libm65/init_rs.c
rename to lib/init_rs.c
diff --git a/libm65/int.h b/lib/int.h
similarity index 100%
rename from libm65/int.h
rename to lib/int.h
diff --git a/libm65/interleave8.f90 b/lib/interleave8.f90
similarity index 100%
rename from libm65/interleave8.f90
rename to lib/interleave8.f90
diff --git a/libm65/interleave9.f90 b/lib/interleave9.f90
similarity index 100%
rename from libm65/interleave9.f90
rename to lib/interleave9.f90
diff --git a/libm65/ipcomm.cpp b/lib/ipcomm.cpp
similarity index 100%
rename from libm65/ipcomm.cpp
rename to lib/ipcomm.cpp
diff --git a/libm65/jt9.f90 b/lib/jt9.f90
similarity index 100%
rename from libm65/jt9.f90
rename to lib/jt9.f90
diff --git a/libm65/jt9a.f90 b/lib/jt9a.f90
similarity index 100%
rename from libm65/jt9a.f90
rename to lib/jt9a.f90
diff --git a/libm65/jt9sim.f90 b/lib/jt9sim.f90
similarity index 100%
rename from libm65/jt9sim.f90
rename to lib/jt9sim.f90
diff --git a/libm65/k2grid.f b/lib/k2grid.f
similarity index 100%
rename from libm65/k2grid.f
rename to lib/k2grid.f
diff --git a/libm65/met8.21 b/lib/met8.21
similarity index 100%
rename from libm65/met8.21
rename to lib/met8.21
diff --git a/libm65/ms3.f90 b/lib/ms3.f90
similarity index 100%
rename from libm65/ms3.f90
rename to lib/ms3.f90
diff --git a/libm65/msk.f90 b/lib/msk.f90
similarity index 100%
rename from libm65/msk.f90
rename to lib/msk.f90
diff --git a/libm65/msk0.f90 b/lib/msk0.f90
similarity index 100%
rename from libm65/msk0.f90
rename to lib/msk0.f90
diff --git a/libm65/nchar.f b/lib/nchar.f
similarity index 100%
rename from libm65/nchar.f
rename to lib/nchar.f
diff --git a/libm65/noisegen.f90 b/lib/noisegen.f90
similarity index 100%
rename from libm65/noisegen.f90
rename to lib/noisegen.f90
diff --git a/libm65/packbits.f90 b/lib/packbits.f90
similarity index 100%
rename from libm65/packbits.f90
rename to lib/packbits.f90
diff --git a/libm65/packcall.f b/lib/packcall.f
similarity index 100%
rename from libm65/packcall.f
rename to lib/packcall.f
diff --git a/libm65/packdxcc.f b/lib/packdxcc.f
similarity index 100%
rename from libm65/packdxcc.f
rename to lib/packdxcc.f
diff --git a/libm65/packgrid.f b/lib/packgrid.f
similarity index 100%
rename from libm65/packgrid.f
rename to lib/packgrid.f
diff --git a/libm65/packmsg.f b/lib/packmsg.f
similarity index 100%
rename from libm65/packmsg.f
rename to lib/packmsg.f
diff --git a/libm65/packtext.f b/lib/packtext.f
similarity index 100%
rename from libm65/packtext.f
rename to lib/packtext.f
diff --git a/libm65/pctile.f b/lib/pctile.f
similarity index 100%
rename from libm65/pctile.f
rename to lib/pctile.f
diff --git a/libm65/pfx.f b/lib/pfx.f
similarity index 100%
rename from libm65/pfx.f
rename to lib/pfx.f
diff --git a/libm65/pfxdump.f b/lib/pfxdump.f
similarity index 100%
rename from libm65/pfxdump.f
rename to lib/pfxdump.f
diff --git a/libm65/ptt.c b/lib/ptt.c
similarity index 100%
rename from libm65/ptt.c
rename to lib/ptt.c
diff --git a/libm65/ptt_unix.c b/lib/ptt_unix.c
similarity index 100%
rename from libm65/ptt_unix.c
rename to lib/ptt_unix.c
diff --git a/libm65/rs.h b/lib/rs.h
similarity index 100%
rename from libm65/rs.h
rename to lib/rs.h
diff --git a/libm65/scr258.f90 b/lib/scr258.f90
similarity index 100%
rename from libm65/scr258.f90
rename to lib/scr258.f90
diff --git a/libm65/sec_midn.f90 b/lib/sec_midn.f90
similarity index 100%
rename from libm65/sec_midn.f90
rename to lib/sec_midn.f90
diff --git a/libm65/set.f b/lib/set.f
similarity index 100%
rename from libm65/set.f
rename to lib/set.f
diff --git a/libm65/sleep.h b/lib/sleep.h
similarity index 100%
rename from libm65/sleep.h
rename to lib/sleep.h
diff --git a/libm65/sleep_msec.f90 b/lib/sleep_msec.f90
similarity index 100%
rename from libm65/sleep_msec.f90
rename to lib/sleep_msec.f90
diff --git a/libm65/sort.f b/lib/sort.f
similarity index 100%
rename from libm65/sort.f
rename to lib/sort.f
diff --git a/libm65/spec9.f90 b/lib/spec9.f90
similarity index 100%
rename from libm65/spec9.f90
rename to lib/spec9.f90
diff --git a/libm65/ss.bat b/lib/ss.bat
similarity index 100%
rename from libm65/ss.bat
rename to lib/ss.bat
diff --git a/libm65/ssort.f b/lib/ssort.f
similarity index 100%
rename from libm65/ssort.f
rename to lib/ssort.f
diff --git a/libm65/symspec.f90 b/lib/symspec.f90
similarity index 100%
rename from libm65/symspec.f90
rename to lib/symspec.f90
diff --git a/libm65/symspecx.f90 b/lib/symspecx.f90
similarity index 100%
rename from libm65/symspecx.f90
rename to lib/symspecx.f90
diff --git a/libm65/sync9.f90 b/lib/sync9.f90
similarity index 100%
rename from libm65/sync9.f90
rename to lib/sync9.f90
diff --git a/libm65/tab.c b/lib/tab.c
similarity index 100%
rename from libm65/tab.c
rename to lib/tab.c
diff --git a/libm65/tastro.f90 b/lib/tastro.f90
similarity index 100%
rename from libm65/tastro.f90
rename to lib/tastro.f90
diff --git a/libm65/timer.f90 b/lib/timer.f90
similarity index 100%
rename from libm65/timer.f90
rename to lib/timer.f90
diff --git a/libm65/timeval.h b/lib/timeval.h
similarity index 100%
rename from libm65/timeval.h
rename to lib/timeval.h
diff --git a/libm65/timf2.f90 b/lib/timf2.f90
similarity index 100%
rename from libm65/timf2.f90
rename to lib/timf2.f90
diff --git a/libm65/timf2x.f90 b/lib/timf2x.f90
similarity index 100%
rename from libm65/timf2x.f90
rename to lib/timf2x.f90
diff --git a/libm65/trimlist.f b/lib/trimlist.f
similarity index 100%
rename from libm65/trimlist.f
rename to lib/trimlist.f
diff --git a/libm65/unpackbits.f90 b/lib/unpackbits.f90
similarity index 100%
rename from libm65/unpackbits.f90
rename to lib/unpackbits.f90
diff --git a/libm65/unpackcall.f b/lib/unpackcall.f
similarity index 100%
rename from libm65/unpackcall.f
rename to lib/unpackcall.f
diff --git a/libm65/unpackgrid.f b/lib/unpackgrid.f
similarity index 100%
rename from libm65/unpackgrid.f
rename to lib/unpackgrid.f
diff --git a/libm65/unpackmsg.f b/lib/unpackmsg.f
similarity index 100%
rename from libm65/unpackmsg.f
rename to lib/unpackmsg.f
diff --git a/libm65/unpacktext.f b/lib/unpacktext.f
similarity index 100%
rename from libm65/unpacktext.f
rename to lib/unpacktext.f
diff --git a/libm65/vit216.c b/lib/vit216.c
similarity index 100%
rename from libm65/vit216.c
rename to lib/vit216.c
diff --git a/mainwindow.cpp b/mainwindow.cpp
index a120db1b3..48d16902e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//------------------------------------------------------------- MainWindow
+//-------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/wsjtx.pro b/wsjtx.pro
index 1b9987872..0f927fbb5 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -54,7 +54,7 @@ RC_FILE = wsjtx.rc
 unix {
 INCLUDEPATH += $$quote(/usr/include/qwt-qt4)
 LIBS += -lfftw3f /usr/lib/libgfortran.so.3
-LIBS += ../wsjtx/libm65/libjt9.a
+LIBS += ../wsjtx/lib/libjt9.a
 LIBS += /usr/lib/libqwt-qt4.so
 LIBS += -lportaudio
 #LIBS +- -lusb
@@ -62,7 +62,7 @@ LIBS += -lportaudio
 
 win32 {
 INCLUDEPATH += c:/qwt-6.0.1/include
-LIBS += ../wsjtx/libm65/libjt9.a
+LIBS += ../wsjtx/lib/libjt9.a
 LIBS += ../wsjtx/libfftw3f_win.a
 LIBS += ../QtSupport/palir-02.dll
 LIBS += libwsock32