27 files changed, 179 insertions, 549 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index e2a3b72..c7f33a0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,17 +11,19 @@ flumap_SOURCES = \
         controller/callbacks/display.c \
         controller/callbacks/keyboard.c \
         controller/callbacks/mouse.c \
+        controller/callbacks/mouse_motion.c \
         controller/callbacks/mouse_wheel.c \
         controller/callbacks/reshape.c \
         db/dbconnect.c \
         flumap.c \
-        model/base.c \
+        model/data/base.c \
         model/geometry/density_legend_geometry.c \
         model/geometry/map_geometry.c \
         model/geometry/protein_geometry.c \
         model/geometry/protein_selected_geometry.c \
-        model/selection_info_init.c \
-        model/zoom_info_init.c \
+        model/state/pan_info_init.c \
+        model/state/selection_info_init.c \
+        model/state/zoom_info_init.c \
         util/ati_meminfo.c \
         util/check_error.c \
         util/pick_convert.c \
@@ -44,20 +46,23 @@ noinst_HEADERS = \
         controller/callbacks/display.h \
         controller/callbacks/keyboard.h \
         controller/callbacks/mouse.h \
+        controller/callbacks/mouse_motion.h \
         controller/callbacks/mouse_wheel.h \
         controller/callbacks/reshape.h \
         db/dbconnect.h \
-        model/base.h \
-        model/state.h \
+        model/data/base.h \
+        model/data/coordinates.h \
         model/geometry/density_legend_geometry.h \
         model/geometry/map_geometry.h \
         model/geometry/protein_geometry.h \
         model/geometry/protein_selected_geometry.h \
-        model/selection_info.h \
-        model/selection_info_init.h \
-        model/selection_purposes.h \
-        model/zoom_info.h \
-        model/zoom_info_init.h \
+        model/state/pan_info.h \
+        model/state/selection_info.h \
+        model/state/selection_info_init.h \
+        model/state/selection_purposes.h \
+        model/state/state.h \
+        model/state/zoom_info.h \
+        model/state/zoom_info_init.h \
         util/ati_meminfo.h \
         util/check_error.h \
         util/pick_convert.h \
@@ -86,4 +91,4 @@ CLEANFILES = \
         controller/actions/selection_from_db.c \
         controller/actions/sel_save.c \
         db/dbconnect.c \
-        model/base.c
+        model/data/base.c