15 files changed, 26 insertions, 23 deletions

diff --git a/build.c b/build.c
index 7f378f4..90edf32 100644
--- a/build.c
+++ b/build.c
@@ -109,7 +109,7 @@ int main(int argc, char** argv) {
       }
 
       if (fork() == 0) {
-        char* args[] = {"gcc", "src/main.c", "-o", "output/main.o", NULL};
+        char* args[] = {"gcc", "src/engine.c", "-o", "output/main.o", NULL};
         print_cmd(args);
         execvp(args[0], args);
         return 0;
@@ -125,7 +125,7 @@ int main(int argc, char** argv) {
   }
 
   if (fork() == 0) {
-    char* args[] = {"gcc", "src/main.c", "-o", "output/main.o", NULL};
+    char* args[] = {"gcc", "src/engine.c", "-o", "output/main.o", NULL};
     print_cmd(args);
     execvp(args[0], args);
     return 0;
diff --git a/src/main.c b/src/engine.c
index d022e71..eec420d 100644
--- a/src/main.c
+++ b/src/engine.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <assert.h>
-#include "bitboard.h"
-#include "search.h"
+#include "engine/bitboard.h"
+#include "engine/moves.h"
 
 void comms_main();
 int direct_run();
@@ -18,6 +18,9 @@ void comms_main() {
   mqd_t tx = mq_open("/engine_to_server", O_WRONLY);
   mqd_t rx = mq_open("/server_to_engine", O_RDONLY);
 
+  moves_t moves = moves_init();
+  position_t position = position_starting();
+
   send_queue(tx, "hello");
   send_queue(tx, "hello2");
   // send_queue(tx, "hello");
@@ -66,5 +69,5 @@ position.bitboards[BLACK_PAWN] = 71776119061217280ULL;
   return 0;
 }
 
-#include "bitboard.c"
-#include "search.c"
+#include "engine/bitboard.c"
+#include "engine/moves.c"
diff --git a/src/bitboard.c b/src/engine/bitboard.c
index 4746020..4746020 100644
--- a/src/bitboard.c
+++ b/src/engine/bitboard.c
diff --git a/src/bitboard.h b/src/engine/bitboard.h
index 912cad0..912cad0 100644
--- a/src/bitboard.h
+++ b/src/engine/bitboard.h
diff --git a/src/ints.h b/src/engine/ints.h
index b134fe6..b134fe6 100644
--- a/src/ints.h
+++ b/src/engine/ints.h
diff --git a/src/engine/moves.c b/src/engine/moves.c
new file mode 100644
index 0000000..662aa54
--- /dev/null
+++ b/src/engine/moves.c
@@ -0,0 +1,7 @@
+#include "moves/vec.c"
+#include "moves/king.c"
+#include "moves/knight.c"
+#include "moves/pawn.c"
+#include "moves/rook.c"
+#include "moves/bishop.c"
+#include "moves/queen.c"
diff --git a/src/search.h b/src/engine/moves.h
index 85311f1..8081ffe 100644
--- a/src/search.h
+++ b/src/engine/moves.h
@@ -1,5 +1,5 @@
-#ifndef SEARCH_H
-#define SEARCH_H
+#ifndef MOVES_H
+#define MOVES_H
 
 #include "ints.h"
 #include "bitboard.h"
@@ -43,4 +43,4 @@ void __forloop_bishop_moves_gen(
   bitboard_t enemy_pieces
 );
 
-#endif // !SEARCH_H
+#endif // !MOVES_H
diff --git a/src/search/bishop_moves.c b/src/engine/moves/bishop.c
index 207535e..52b90b3 100644
--- a/src/search/bishop_moves.c
+++ b/src/engine/moves/bishop.c
@@ -1,4 +1,4 @@
-#include "search.h"
+#include "../moves.h"
 
 void __forloop_bishop_moves_gen(
   moves_t* moves,
diff --git a/src/search/king_moves.c b/src/engine/moves/king.c
index 3f245cc..0637109 100644
--- a/src/search/king_moves.c
+++ b/src/engine/moves/king.c
@@ -1,4 +1,4 @@
-#include "../search.h"
+#include "../moves.h"
 
 void get_king_moves(moves_t* moves, position_t position) {
   assert_valid_position(position);
diff --git a/src/search/knight_moves.c b/src/engine/moves/knight.c
index 34cf66a..c48b48e 100644
--- a/src/search/knight_moves.c
+++ b/src/engine/moves/knight.c
@@ -1,4 +1,4 @@
-#include "../search.h"
+#include "../moves.h"
 
 bitboard_t knight_moves[64] = {
   132096ULL,
diff --git a/src/search/pawn_moves.c b/src/engine/moves/pawn.c
index 6b85cc2..3cd28b8 100644
--- a/src/search/pawn_moves.c
+++ b/src/engine/moves/pawn.c
@@ -1,4 +1,4 @@
-#include "../search.h"
+#include "../moves.h"
 
 bitboard_t get_white_pawn_forwardmoves(moves_t* moves, position_t position) {
   bitboard_t enemy_bitboard = blacks(position);
diff --git a/src/search/queen_moves.c b/src/engine/moves/queen.c
index 973c5bc..9e6e5c4 100644
--- a/src/search/queen_moves.c
+++ b/src/engine/moves/queen.c
@@ -1,4 +1,4 @@
-#include "search.h"
+#include "../moves.h"
 
 void get_queen_moves(moves_t* moves, position_t position) {
   assert_valid_position(position);
diff --git a/src/search/rook_moves.c b/src/engine/moves/rook.c
index 3e25526..c5867d5 100644
--- a/src/search/rook_moves.c
+++ b/src/engine/moves/rook.c
@@ -1,4 +1,4 @@
-#include "search.h"
+#include "../moves.h"
 
 void __forloop_rook_moves_gen(
   moves_t* moves,
diff --git a/src/search/moves.c b/src/engine/moves/vec.c
index c0cdb4e..6192706 100644
--- a/src/search/moves.c
+++ b/src/engine/moves/vec.c
@@ -1,4 +1,4 @@
-#include "../search.h"
+#include "../moves.h"
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/src/search.c b/src/search.c
deleted file mode 100644
index e389087..0000000
--- a/src/search.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "search/moves.c"
-#include "search/king_moves.c"
-#include "search/knight_moves.c"
-#include "search/pawn_moves.c"
-#include "search/rook_moves.c"
-#include "search/bishop_moves.c"
-#include "search/queen_moves.c"