36 files changed, 332 insertions, 176 deletions

diff --git a/src/view/exp004view.c b/src/view/exp004view.c
index 434c016..b16597d 100644
--- a/src/view/exp004view.c
+++ b/src/view/exp004view.c
@@ -1,8 +1,8 @@
-#include "../controller/exp004display.h"
-#include "../controller/exp004mouse.h"
-#include "../controller/exp004reshape.h"
-#include "../controller/keyboard.h"
-#include "../controller/mousewheel.h"
+#include "../controller/callbacks/display.h"
+#include "../controller/callbacks/keyboard.h"
+#include "../controller/callbacks/mouse.h"
+#include "../controller/callbacks/mouse_wheel.h"
+#include "../controller/callbacks/reshape.h"
 #include "../db/dbconnect.h"
 #include "exp004init.h"
 #include "exp004state0.h"
@@ -44,12 +44,12 @@ exp004view (void)
   // Initialize the model.
   exp004init ();
 
-  // Callbacks (Controllers)
-  glutDisplayFunc (exp004display);
+  // Callbacks
+  glutDisplayFunc (display);
   glutKeyboardFunc (keyboard);
-  glutMouseFunc (exp004mouse);
-  glutMouseWheelFunc (mousewheel);
-  glutReshapeFunc (exp004reshape);
+  glutMouseFunc (mouse);
+  glutMouseWheelFunc (mouse_wheel);
+  glutReshapeFunc (reshape);
 
   return;
 }