diff --git a/cpp/src/ais/ai.hpp b/cpp/src/ais/ai.hpp
new file mode 100644
index 0000000..a1748e0
--- /dev/null
+++ b/cpp/src/ais/ai.hpp
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "../board.hpp"
+
+#include <string>
+
+#define DECLARE_AI(x)                                                          \
+    struct x : public AI {                                                     \
+        std::string search(std::string, int) override;                         \
+        int minimax(const Board&, int) override;                               \
+        int eval(const Board&) override;                                       \
+    };
+
+namespace ai {
+    struct AI {
+        virtual std::string search(std::string, int) = 0;
+        virtual int minimax(const Board&, int) = 0;
+        virtual int eval(const Board&) = 0;
+    };
+
+    DECLARE_AI(v0_random)
+    DECLARE_AI(v1_simple)
+} // namespace ai
diff --git a/cpp/src/stickfosh.cpp b/cpp/src/ais/v1_simple.cpp
similarity index 85%
rename from cpp/src/stickfosh.cpp
rename to cpp/src/ais/v1_simple.cpp
index 97e7596..b3b9fb8 100644
--- a/cpp/src/stickfosh.cpp
+++ b/cpp/src/ais/v1_simple.cpp
@@ -1,14 +1,13 @@
-#include "stickfosh.hpp"
-
-#include "pieces/piece.hpp"
-#include "threadpool.hpp"
+#include "../pieces/piece.hpp"
+#include "../threadpool.hpp"
+#include "ai.hpp"
 
 #include <future>
 #include <map>
 
 static int INFINITY = std::numeric_limits<int>::max();
 
-std::string search(std::string pos, int depth) {
+std::string ai::v1_simple::search(std::string pos, int depth) {
     Board b = Board::setup_fen_position(pos);
 
     ThreadPool pool(std::thread::hardware_concurrency());
@@ -18,7 +17,9 @@ std::string search(std::string pos, int depth) {
     for (const Move& move : moves) {
         Board tmp_board = b.make_move(move);
         futures.insert(
-            {move.to_string(), pool.enqueue(minimax, tmp_board, depth - 1)}
+            {move.to_string(), pool.enqueue([this, tmp_board, depth]() {
+                 return minimax(tmp_board, depth - 1);
+             })}
         );
     }
 
@@ -35,7 +36,7 @@ std::string search(std::string pos, int depth) {
     return best_move;
 }
 
-int minimax(const Board& b, int depth) {
+int ai::v1_simple::minimax(const Board& b, int depth) {
     if (b.is_checkmate_for(b.white_to_play ? White : Black))
         return -INFINITY;
 
@@ -84,7 +85,7 @@ int count_material(const Board& b, int8_t colour) {
     return ret;
 }
 
-int eval(const Board& b) {
+int ai::v1_simple::eval(const Board& b) {
     int white_eval = count_material(b, Colour::White);
     int black_eval = count_material(b, Colour::Black);
 
diff --git a/cpp/src/stickfosh.hpp b/cpp/src/stickfosh.hpp
deleted file mode 100644
index c4cd979..0000000
--- a/cpp/src/stickfosh.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "board.hpp"
-
-#include <string>
-
-std::string search(std::string, int);
-int minimax(const Board&, int);
-int eval(const Board&);