diff --git a/pipi/Makefile.am b/pipi/Makefile.am
index 951e022..adc3279 100644
--- a/pipi/Makefile.am
+++ b/pipi/Makefile.am
@@ -26,7 +26,6 @@ libpipi_la_SOURCES = \
 	colorstring.c \
 	resize.c \
 	dither.c \
-	measure.c \
 	accessors.c \
 	$(codec_sources) \
 	$(paint_sources) \
@@ -35,7 +34,7 @@ libpipi_la_SOURCES = \
 	$(filter_sources) \
 	$(quantize_sources) \
 	$(dither_sources) \
-	$(histogram_sources) \
+	$(analysis_sources) \
 	$(NULL)
 libpipi_la_CFLAGS = $(codec_cflags)
 libpipi_la_LDFLAGS = $(codec_libs) \
@@ -84,8 +83,9 @@ dither_sources = \
 	dither/dbs.c \
 	dither/random.c
 
-histogram_sources = \
-	histogram/histogram.c
+analysis_sources = \
+	analysis/measure.c \
+	analysis/histogram.c
 
 # Conditional sources
 
diff --git a/pipi/histogram/histogram.c b/pipi/analysis/histogram.c
similarity index 100%
rename from pipi/histogram/histogram.c
rename to pipi/analysis/histogram.c
diff --git a/pipi/measure.c b/pipi/analysis/measure.c
similarity index 100%
rename from pipi/measure.c
rename to pipi/analysis/measure.c