diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4af7e5dcb..da53e1be8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -581,12 +581,12 @@ set_source_files_properties (${ka9q_CSRCS} PROPERTIES COMPILE_FLAGS -Wno-sign-co
 set (qra_CSRCS
   lib/qra/qra64/qra64.c
   lib/qra/qra64/qra64_subs.c
-  lib/qra/qracodes/npfwht.c
-  lib/qra/qracodes/pdmath.c 
   lib/qra/qracodes/qra12_63_64_irr_b.c
   lib/qra/qracodes/qra13_64_64_irr_e.c
-  lib/qra/qracodes/qracodes.c
-  lib/qra/qracodes/normrnd.c
+  lib/qra/q65/npfwht.c
+  lib/qra/q65/pdmath.c
+  lib/qra/q65/qracodes.c
+  lib/qra/q65/normrnd.c
   lib/qra/q65/qra15_65_64_irr_e23.c
   lib/qra/q65/q65.c
   lib/qra/q65/q65_subs.c
diff --git a/lib/qra/q65/q65_ftn_test.f90 b/lib/qra/q65/q65_ftn_test.f90
index 6291950a2..6ff17ddf6 100644
--- a/lib/qra/q65/q65_ftn_test.f90
+++ b/lib/qra/q65/q65_ftn_test.f90
@@ -25,7 +25,7 @@ program q65_ftn_test
   read(c77,1000) x
 1000 format(12b6.6,b5.5)
 
-  call q65_enc(x,y)
+  call q65_enc(x,y)                            !Encode message, x(1:13) ==> y(1:63)
   
   write(*,1010) x,msg0
 1010 format('User message:'/13i3,2x,a)