diff --git a/LICENSE-libdivide.txt b/OMPEval/LICENSE-libdivide.txt
similarity index 100%
rename from LICENSE-libdivide.txt
rename to OMPEval/LICENSE-libdivide.txt
diff --git a/LICENSE.txt b/OMPEval/LICENSE.txt
similarity index 100%
rename from LICENSE.txt
rename to OMPEval/LICENSE.txt
diff --git a/Makefile b/OMPEval/Makefile
similarity index 100%
rename from Makefile
rename to OMPEval/Makefile
diff --git a/README.md b/OMPEval/README.md
similarity index 100%
rename from README.md
rename to OMPEval/README.md
diff --git a/benchmark.cpp b/OMPEval/benchmark.cpp
similarity index 100%
rename from benchmark.cpp
rename to OMPEval/benchmark.cpp
diff --git a/libdivide/LICENSE.txt b/OMPEval/libdivide/LICENSE.txt
similarity index 100%
rename from libdivide/LICENSE.txt
rename to OMPEval/libdivide/LICENSE.txt
diff --git a/libdivide/libdivide.h b/OMPEval/libdivide/libdivide.h
similarity index 100%
rename from libdivide/libdivide.h
rename to OMPEval/libdivide/libdivide.h
diff --git a/omp/CardRange.cpp b/OMPEval/omp/CardRange.cpp
similarity index 100%
rename from omp/CardRange.cpp
rename to OMPEval/omp/CardRange.cpp
diff --git a/omp/CardRange.h b/OMPEval/omp/CardRange.h
similarity index 100%
rename from omp/CardRange.h
rename to OMPEval/omp/CardRange.h
diff --git a/omp/CombinedRange.cpp b/OMPEval/omp/CombinedRange.cpp
similarity index 100%
rename from omp/CombinedRange.cpp
rename to OMPEval/omp/CombinedRange.cpp
diff --git a/omp/CombinedRange.h b/OMPEval/omp/CombinedRange.h
similarity index 100%
rename from omp/CombinedRange.h
rename to OMPEval/omp/CombinedRange.h
diff --git a/omp/Constants.h b/OMPEval/omp/Constants.h
similarity index 100%
rename from omp/Constants.h
rename to OMPEval/omp/Constants.h
diff --git a/omp/EquityCalculator.cpp b/OMPEval/omp/EquityCalculator.cpp
similarity index 100%
rename from omp/EquityCalculator.cpp
rename to OMPEval/omp/EquityCalculator.cpp
diff --git a/omp/EquityCalculator.h b/OMPEval/omp/EquityCalculator.h
similarity index 100%
rename from omp/EquityCalculator.h
rename to OMPEval/omp/EquityCalculator.h
diff --git a/omp/Hand.h b/OMPEval/omp/Hand.h
similarity index 100%
rename from omp/Hand.h
rename to OMPEval/omp/Hand.h
diff --git a/omp/HandEvaluator.cpp b/OMPEval/omp/HandEvaluator.cpp
similarity index 100%
rename from omp/HandEvaluator.cpp
rename to OMPEval/omp/HandEvaluator.cpp
diff --git a/omp/HandEvaluator.h b/OMPEval/omp/HandEvaluator.h
similarity index 99%
rename from omp/HandEvaluator.h
rename to OMPEval/omp/HandEvaluator.h
index 91cef43..307c80e 100644
--- a/omp/HandEvaluator.h
+++ b/OMPEval/omp/HandEvaluator.h
@@ -6,6 +6,7 @@
 #include "Hand.h"
 #include <cstdint>
 #include <cassert>
+#include <functional>
 
 namespace omp {
 
diff --git a/omp/OffsetTable.hxx b/OMPEval/omp/OffsetTable.hxx
similarity index 100%
rename from omp/OffsetTable.hxx
rename to OMPEval/omp/OffsetTable.hxx
diff --git a/omp/Random.h b/OMPEval/omp/Random.h
similarity index 100%
rename from omp/Random.h
rename to OMPEval/omp/Random.h
diff --git a/omp/Util.h b/OMPEval/omp/Util.h
similarity index 100%
rename from omp/Util.h
rename to OMPEval/omp/Util.h
diff --git a/test.cpp b/OMPEval/test.cpp
similarity index 100%
rename from test.cpp
rename to OMPEval/test.cpp
diff --git a/ttest/ttest.h b/OMPEval/ttest/ttest.h
similarity index 100%
rename from ttest/ttest.h
rename to OMPEval/ttest/ttest.h