diff --git a/CMakeLists.txt b/CMakeLists.txt
index 106f5e67b..a4b75c3df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,7 +519,6 @@ pda.cpp
 phyloanalysis.cpp phyloanalysis.h
 stoprule.cpp stoprule.h
 tools.cpp tools.h
-whtest_wrapper.cpp whtest_wrapper.h
 pllnni.cpp pllnni.h
 phylotesting.cpp phylotesting.h
 candidateset.cpp candidateset.h
diff --git a/phyloanalysis.cpp b/phyloanalysis.cpp
index 5f5918f74..7e43ab5ba 100644
--- a/phyloanalysis.cpp
+++ b/phyloanalysis.cpp
@@ -49,7 +49,7 @@
 #include "tree/mtreeset.h"
 #include "tree/mexttree.h"
 #include "model/ratemeyerhaeseler.h"
-#include "whtest_wrapper.h"
+#include "whtest/whtest_wrapper.h"
 #include "model/partitionmodel.h"
 #include "model/modelmixture.h"
 #include "model/modelfactorymixlen.h"
diff --git a/whtest/CMakeLists.txt b/whtest/CMakeLists.txt
index 178300f78..4b1992c23 100644
--- a/whtest/CMakeLists.txt
+++ b/whtest/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include_directories("${PROJECT_BINARY_DIR}")
+include_directories("${PROJECT_BINARY_DIR}")
 
 add_library(whtest 
 eigen.c  
@@ -8,7 +8,9 @@ random.c
 weisslambda.c  
 weisslambda_sub.c  
 whtest.c  
-whtest_sub.c)
+whtest_sub.c
+whtest_wrapper.cpp whtest_wrapper.h
+)
 
 #install (TARGETS whtest DESTINATION bin)
-#install (FILES  eigen.h  eigen_sym.h  random.h  tools.h  weisslambda_sub.h  whtest.h  whtest_sub.h DESTINATION include)
\ No newline at end of file
+#install (FILES  eigen.h  eigen_sym.h  random.h  tools.h  weisslambda_sub.h  whtest.h  whtest_sub.h DESTINATION include)
diff --git a/whtest_wrapper.cpp b/whtest/whtest_wrapper.cpp
similarity index 100%
rename from whtest_wrapper.cpp
rename to whtest/whtest_wrapper.cpp
diff --git a/whtest_wrapper.h b/whtest/whtest_wrapper.h
similarity index 100%
rename from whtest_wrapper.h
rename to whtest/whtest_wrapper.h