Reorganized folder structure

9 files changed, 38 insertions, 25 deletions

diff --git a/src/constant_cubes.h b/src/core/constant_cubes.h
index b7748d8..b7748d8 100644
--- a/src/constant_cubes.h
+++ b/src/core/constant_cubes.h
diff --git a/src/core/core.h b/src/core/core.h
new file mode 100644
index 0000000..6ffd76f
--- /dev/null
+++ b/src/core/core.h
@@ -0,0 +1,13 @@
+#include "constant_cubes.h"
+#include "io_moves.h"
+#include "io_trans.h"
+#include "cube.h"
+#include "io_cube.h"
+#include "moves.h"
+
+/* TODO: work in progress */
+#if 0
+#include "transform.h"
+#else
+#include "transform_with_switch.h"
+#endif
diff --git a/src/cube_generic.h b/src/core/cube.h
index fe36f90..fe36f90 100644
--- a/src/cube_generic.h
+++ b/src/core/cube.h
diff --git a/src/io_cube.h b/src/core/io_cube.h
index 956494d..956494d 100644
--- a/src/io_cube.h
+++ b/src/core/io_cube.h
diff --git a/src/io_move_trans.h b/src/core/io_moves.h
index cfeb93c..eb6290e 100644
--- a/src/io_move_trans.h
+++ b/src/core/io_moves.h
@@ -1,8 +1,6 @@
 _static uint8_t readmove(char);
 _static uint8_t readmodifier(char);
-_static uint8_t readtrans(const char *);
 _static int writemoves(uint8_t *, int, char *);
-_static void writetrans(uint8_t, char *);
 
 _static uint8_t
 readmove(char c)
@@ -40,19 +38,6 @@ readmodifier(char c)
         }
 }
 
-_static uint8_t
-readtrans(const char *buf)
-{
-        uint8_t t;
-
-        for (t = 0; t < 48; t++)
-                if (!strncmp(buf, transstr[t], 11))
-                        return t;
-
-        LOG("readtrans error\n");
-        return _error;
-}
-
 _static int
 writemoves(uint8_t *m, int n, char *buf)
 {
@@ -75,13 +60,3 @@ writemoves(uint8_t *m, int n, char *buf)
 
         return b - buf;
 }
-
-_static void
-writetrans(uint8_t t, char *buf)
-{
-        if (t >= 48)
-                memcpy(buf, "error trans", 11);
-        else
-                memcpy(buf, transstr[t], 11);
-        buf[11] = '\0';
-}
diff --git a/src/core/io_trans.h b/src/core/io_trans.h
new file mode 100644
index 0000000..7187b7a
--- /dev/null
+++ b/src/core/io_trans.h
@@ -0,0 +1,25 @@
+_static uint8_t readtrans(const char *);
+_static void writetrans(uint8_t, char *);
+
+_static uint8_t
+readtrans(const char *buf)
+{
+        uint8_t t;
+
+        for (t = 0; t < 48; t++)
+                if (!strncmp(buf, transstr[t], 11))
+                        return t;
+
+        LOG("readtrans error\n");
+        return _error;
+}
+
+_static void
+writetrans(uint8_t t, char *buf)
+{
+        if (t >= 48)
+                memcpy(buf, "error trans", 11);
+        else
+                memcpy(buf, transstr[t], 11);
+        buf[11] = '\0';
+}
diff --git a/src/moves.h b/src/core/moves.h
index 7da6405..7da6405 100644
--- a/src/moves.h
+++ b/src/core/moves.h
diff --git a/src/cube_transform.h b/src/core/transform.h
index 358b051..358b051 100644
--- a/src/cube_transform.h
+++ b/src/core/transform.h
diff --git a/src/cube_transform_with_switch.h b/src/core/transform_with_switch.h
index d3a108c..d3a108c 100644
--- a/src/cube_transform_with_switch.h
+++ b/src/core/transform_with_switch.h