diff --git a/message-types/draw-msg.sml b/message-types/draw-msg.sml
index 40a9961..e4c8f34 100644
--- a/message-types/draw-msg.sml
+++ b/message-types/draw-msg.sml
@@ -1,21 +1,4 @@
-signature DRAW_MESSAGE =
-sig
-  datatype t =
-    DRAW_DOT of Real32.real vector
-  | DRAW_TRIANGLES_AND_DOTS of
-      {triangles: Real32.real vector, dots: Real32.real vector}
-  | DRAW_TRIANGLES_AND_RESET_DOTS of Real32.real vector
-  | DRAW_GRAPH of Real32.real vector
-  | RESIZE_TRIANGLES_DOTS_AND_GRAPH of
-      { triangles: Real32.real vector
-      , graphLines: Real32.real vector
-      , dots: Real32.real vector
-      }
-  | CLEAR_DOTS
-  | DRAW_MODAL_TEXT of Real32.real vector
-end
-
-structure DrawMessage :> DRAW_MESSAGE =
+structure DrawMessage =
 struct
   datatype t =
     DRAW_DOT of Real32.real vector
diff --git a/message-types/file-msg.sml b/message-types/file-msg.sml
index 1db8c13..674fde6 100644
--- a/message-types/file-msg.sml
+++ b/message-types/file-msg.sml
@@ -1,14 +1,4 @@
-signature FILE_MESSAGE =
-sig
-  datatype t =
-    SAVE_TRIANGLES of AppType.triangle list
-  | LOAD_TRIANGLES
-  | EXPORT_TRIANGLES of AppType.triangle list
-  | LOAD_FILES of string
-  | SELECT_PATH of string
-end
-
-structure FileMessage :> FILE_MESSAGE =
+structure FileMessage =
 struct
   datatype t =
     SAVE_TRIANGLES of AppType.triangle list
diff --git a/message-types/input-msg.sml b/message-types/input-msg.sml
index cbd01bb..e8a21aa 100644
--- a/message-types/input-msg.sml
+++ b/message-types/input-msg.sml
@@ -1,34 +1,4 @@
-signature INPUT_MESSAGE =
-sig
-  datatype t =
-    MOUSE_MOVE of {x: Real32.real, y: Real32.real}
-  | MOUSE_LEFT_CLICK
-  | MOUSE_LEFT_RELEASE
-  | RESIZE_WINDOW of {width: int, height: int}
-  | UNDO_ACTION
-  | REDO_ACTION
-  | KEY_R
-  | KEY_G
-  | KEY_B
-  | KEY_T
-  | KEY_CTRL_S
-  | KEY_CTRL_L
-  | KEY_CTRL_E
-  | KEY_CTRL_O
-  | NUM of int
-  | ARROW_UP
-  | ARROW_LEFT
-  | ARROW_RIGHT
-  | ARROW_DOWN
-  | KEY_ENTER
-  | KEY_SPACE
-  | USE_TRIANGLES of AppType.triangle list
-  | TRIANGLES_LOAD_ERROR
-  | FILE_BROWSER_AND_PATH of
-      {fileBrowser: AppType.file_browser_item vector, path: string}
-end
-
-structure InputMessage :> INPUT_MESSAGE =
+structure InputMessage =
 struct
   datatype t =
     MOUSE_MOVE of {x: Real32.real, y: Real32.real}
diff --git a/temp-squares/app-init.sml b/temp-squares/fcore/app-init.sml
similarity index 100%
rename from temp-squares/app-init.sml
rename to temp-squares/fcore/app-init.sml
diff --git a/temp-squares/app-type.sml b/temp-squares/fcore/app-type.sml
similarity index 100%
rename from temp-squares/app-type.sml
rename to temp-squares/fcore/app-type.sml
diff --git a/temp-squares/app-with.sml b/temp-squares/fcore/app-with.sml
similarity index 100%
rename from temp-squares/app-with.sml
rename to temp-squares/fcore/app-with.sml
diff --git a/temp-squares/click-points.sml b/temp-squares/fcore/click-points.sml
similarity index 100%
rename from temp-squares/click-points.sml
rename to temp-squares/fcore/click-points.sml
diff --git a/temp-squares/graph-lines.sml b/temp-squares/fcore/graph-lines.sml
similarity index 100%
rename from temp-squares/graph-lines.sml
rename to temp-squares/fcore/graph-lines.sml
diff --git a/temp-squares/quad-tree.sml b/temp-squares/fcore/quad-tree.sml
similarity index 100%
rename from temp-squares/quad-tree.sml
rename to temp-squares/fcore/quad-tree.sml
diff --git a/temp-squares/message-types/draw-msg.sml b/temp-squares/message-types/draw-msg.sml
new file mode 100644
index 0000000..f063d64
--- /dev/null
+++ b/temp-squares/message-types/draw-msg.sml
@@ -0,0 +1,16 @@
+structure DrawMessage =
+struct
+  datatype t =
+    DRAW_DOT of Real32.real vector
+  | DRAW_SQUARES_AND_DOTS of
+      {squares: Real32.real vector, dots: Real32.real vector}
+  | DRAW_SQUARES_AND_RESET_DOTS of Real32.real vector
+  | DRAW_GRAPH of Real32.real vector
+  | RESIZE_SQUARES_DOTS_AND_GRAPH of
+      { squares: Real32.real vector
+      , graphLines: Real32.real vector
+      , dots: Real32.real vector
+      }
+  | CLEAR_DOTS
+  | DRAW_MODAL_TEXT of Real32.real vector
+end
diff --git a/temp-squares/message-types/file-msg.sml b/temp-squares/message-types/file-msg.sml
new file mode 100644
index 0000000..02156db
--- /dev/null
+++ b/temp-squares/message-types/file-msg.sml
@@ -0,0 +1,9 @@
+structure FileMessage =
+struct
+  datatype t =
+    SAVE_SQUARES of int vector vector
+  | LOAD_SQUARES
+  | EXPORT_SQUARES of int vector vector
+  | LOAD_FILES of string
+  | SELECT_PATH of string
+end
diff --git a/temp-squares/message-types/input-msg.sml b/temp-squares/message-types/input-msg.sml
new file mode 100644
index 0000000..d488709
--- /dev/null
+++ b/temp-squares/message-types/input-msg.sml
@@ -0,0 +1,30 @@
+structure InputMessage =
+struct
+  datatype t =
+    MOUSE_MOVE of {x: Real32.real, y: Real32.real}
+  | MOUSE_LEFT_CLICK
+  | MOUSE_LEFT_RELEASE
+  | RESIZE_WINDOW of {width: int, height: int}
+  | UNDO_ACTION
+  | REDO_ACTION
+  | KEY_R
+  | KEY_G
+  | KEY_B
+  | KEY_T
+  | KEY_CTRL_S
+  | KEY_CTRL_L
+  | KEY_CTRL_E
+  | KEY_CTRL_O
+  | NUM of int
+  | ARROW_UP
+  | ARROW_LEFT
+  | ARROW_RIGHT
+  | ARROW_DOWN
+  | KEY_ENTER
+  | KEY_SPACE
+  | USE_SQUARES of
+      {squares: int vector vector, canvasWidth: int, canvasHeight: int}
+  | SQUARE_LOAD_ERROR
+  | FILE_BROWSER_AND_PATH of
+      {fileBrowser: AppType.file_browser_item vector, path: string}
+end
diff --git a/temp-squares/temp.mlb b/temp-squares/temp.mlb
index 0e3346d..0616129 100644
--- a/temp-squares/temp.mlb
+++ b/temp-squares/temp.mlb
@@ -1,13 +1,17 @@
 $(SML_LIB)/basis/basis.mlb
 
 (* FUNCTIONAL CORE *)
-app-type.sml
-click-points.sml
-app-init.sml
-app-with.sml
+fcore/app-type.sml
+fcore/click-points.sml
+fcore/app-init.sml
+fcore/app-with.sml
 
 ann
   "allowVectorExps true"
 in
-  graph-lines.sml
+  fcore/graph-lines.sml
 end
+
+message-types/draw-msg.sml
+message-types/file-msg.sml
+message-types/input-msg.sml