33 files changed, 530 insertions, 113 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1ccb4f8..e2a3b72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-bin_PROGRAMS = exp004viz
+bin_PROGRAMS = flumap
 
-exp004viz_SOURCES = \
+flumap_SOURCES = \
         controller/actions/clear_selection.c \
         controller/actions/pan.c \
         controller/actions/process_hits.c \
@@ -14,8 +14,8 @@ exp004viz_SOURCES = \
         controller/callbacks/mouse_wheel.c \
         controller/callbacks/reshape.c \
         db/dbconnect.c \
-        exp004viz.c \
-        model/exp004base.c \
+        flumap.c \
+        model/base.c \
         model/geometry/density_legend_geometry.c \
         model/geometry/map_geometry.c \
         model/geometry/protein_geometry.c \
@@ -26,11 +26,11 @@ exp004viz_SOURCES = \
         util/check_error.c \
         util/pick_convert.c \
         util/sqlinfoprint.c \
-        view/exp004geometry.c \
-        view/exp004init.c \
-        view/exp004view.c
+        view/geometry.c \
+        view/init.c \
+        view/view.c
 
-exp004viz_LDADD = ${GLUT_LIBS}
+flumap_LDADD = ${GLUT_LIBS}
 
 noinst_HEADERS = \
         controller/actions/clear_selection.h \
@@ -47,8 +47,8 @@ noinst_HEADERS = \
         controller/callbacks/mouse_wheel.h \
         controller/callbacks/reshape.h \
         db/dbconnect.h \
-        model/exp004base.h \
-        model/exp004state.h \
+        model/base.h \
+        model/state.h \
         model/geometry/density_legend_geometry.h \
         model/geometry/map_geometry.h \
         model/geometry/protein_geometry.h \
@@ -62,10 +62,10 @@ noinst_HEADERS = \
         util/check_error.h \
         util/pick_convert.h \
         util/sqlinfoprint.h \
-        view/exp004geometry.h \
-        view/exp004init.h \
-        view/exp004state0.h \
-        view/exp004view.h
+        view/geometry.h \
+        view/init.h \
+        view/state0.h \
+        view/view.h
 
 # The Linux non-free driver does not appear to include the
 # implementations of the AMD_performance_monitor functions.
@@ -86,4 +86,4 @@ CLEANFILES = \
         controller/actions/selection_from_db.c \
         controller/actions/sel_save.c \
         db/dbconnect.c \
-        model/exp004base.c
+        model/base.c