diff --git a/Makefile b/Makefile
index ade3a5f..bc82eb4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@ PGSPHERE_VERSION = 1.2.1
 SRC_DIR = $(shell basename $(shell pwd))
 
 MODULE_big = pg_sphere
-OBJS       = sscan.o sparse.o sbuffer.o vector3d.o point.o \
-             euler.o circle.o line.o ellipse.o polygon.o \
-             path.o box.o output.o gq_cache.o gist.o key.o \
-             gnomo.o healpix.o moc.o process_moc.o healpix_bare/healpix_bare.o \
-             epochprop.o
+OBJS       = src/sscan.o src/sparse.o src/sbuffer.o src/vector3d.o src/point.o \
+             src/euler.o src/circle.o src/line.o src/ellipse.o src/polygon.o \
+             src/path.o src/box.o src/output.o src/gq_cache.o src/gist.o \
+             src/key.o src/gnomo.o src/healpix.o src/moc.o src/process_moc.o \
+             healpix_bare/healpix_bare.o src/epochprop.o
 
 EXTENSION   = pg_sphere
 RELEASE_SQL = $(EXTENSION)--$(PGSPHERE_VERSION).sql
@@ -208,16 +208,16 @@ endif
 
 # end of local stuff
 
-sscan.o : sparse.c
+src/sscan.o : src/sparse.c
 
-sparse.c: sparse.y
+src/sparse.c: src/sparse.y
 ifdef YACC
-	$(YACC) -d $(YFLAGS) -p sphere_yy -o sparse.c $<
+	$(YACC) -d $(YFLAGS) -p sphere_yy -o $@ $<
 else
 	@$(missing) bison $< $@
 endif
 
-sscan.c : sscan.l
+src/sscan.c : src/sscan.l
 ifdef FLEX
 	$(FLEX) $(FLEXFLAGS) -Psphere -o$@ $<
 else
diff --git a/box.c b/src/box.c
similarity index 100%
rename from box.c
rename to src/box.c
diff --git a/box.h b/src/box.h
similarity index 100%
rename from box.h
rename to src/box.h
diff --git a/circle.c b/src/circle.c
similarity index 100%
rename from circle.c
rename to src/circle.c
diff --git a/circle.h b/src/circle.h
similarity index 100%
rename from circle.h
rename to src/circle.h
diff --git a/ellipse.c b/src/ellipse.c
similarity index 100%
rename from ellipse.c
rename to src/ellipse.c
diff --git a/ellipse.h b/src/ellipse.h
similarity index 100%
rename from ellipse.h
rename to src/ellipse.h
diff --git a/epochprop.c b/src/epochprop.c
similarity index 99%
rename from epochprop.c
rename to src/epochprop.c
index 4c7af21..ab9abc8 100644
--- a/epochprop.c
+++ b/src/epochprop.c
@@ -8,7 +8,7 @@ Transformation: Rigorous Treatment'; cf.
 */
 
 #include <math.h>
-#include <pgs_util.h>
+#include "pgs_util.h"
 
 #include "point.h"
 #include "epochprop.h"
diff --git a/epochprop.h b/src/epochprop.h
similarity index 100%
rename from epochprop.h
rename to src/epochprop.h
diff --git a/euler.c b/src/euler.c
similarity index 100%
rename from euler.c
rename to src/euler.c
diff --git a/euler.h b/src/euler.h
similarity index 100%
rename from euler.h
rename to src/euler.h
diff --git a/gist.c b/src/gist.c
similarity index 100%
rename from gist.c
rename to src/gist.c
diff --git a/gist.h b/src/gist.h
similarity index 100%
rename from gist.h
rename to src/gist.h
diff --git a/gnomo.c b/src/gnomo.c
similarity index 96%
rename from gnomo.c
rename to src/gnomo.c
index c4c554b..a13c8dc 100644
--- a/gnomo.c
+++ b/src/gnomo.c
@@ -1,8 +1,8 @@
 #include <postgres.h>
 #include <fmgr.h>
 
-#include <gnomo.h>
-#include <point.h> /* SPoint from pgsphere */
+#include "gnomo.h"
+#include "point.h" /* SPoint from pgsphere */
 
 #include <math.h>
 
diff --git a/gnomo.h b/src/gnomo.h
similarity index 100%
rename from gnomo.h
rename to src/gnomo.h
diff --git a/gq_cache.c b/src/gq_cache.c
similarity index 100%
rename from gq_cache.c
rename to src/gq_cache.c
diff --git a/healpix.c b/src/healpix.c
similarity index 100%
rename from healpix.c
rename to src/healpix.c
diff --git a/key.c b/src/key.c
similarity index 100%
rename from key.c
rename to src/key.c
diff --git a/key.h b/src/key.h
similarity index 100%
rename from key.h
rename to src/key.h
diff --git a/line.c b/src/line.c
similarity index 100%
rename from line.c
rename to src/line.c
diff --git a/line.h b/src/line.h
similarity index 100%
rename from line.h
rename to src/line.h
diff --git a/moc.c b/src/moc.c
similarity index 100%
rename from moc.c
rename to src/moc.c
diff --git a/output.c b/src/output.c
similarity index 100%
rename from output.c
rename to src/output.c
diff --git a/path.c b/src/path.c
similarity index 100%
rename from path.c
rename to src/path.c
diff --git a/path.h b/src/path.h
similarity index 100%
rename from path.h
rename to src/path.h
diff --git a/pg_sphere.h b/src/pg_sphere.h
similarity index 100%
rename from pg_sphere.h
rename to src/pg_sphere.h
diff --git a/pgs_chealpix.h b/src/pgs_chealpix.h
similarity index 100%
rename from pgs_chealpix.h
rename to src/pgs_chealpix.h
diff --git a/pgs_healpix.h b/src/pgs_healpix.h
similarity index 100%
rename from pgs_healpix.h
rename to src/pgs_healpix.h
diff --git a/pgs_moc.h b/src/pgs_moc.h
similarity index 100%
rename from pgs_moc.h
rename to src/pgs_moc.h
diff --git a/pgs_process_moc.h b/src/pgs_process_moc.h
similarity index 100%
rename from pgs_process_moc.h
rename to src/pgs_process_moc.h
diff --git a/pgs_util.h b/src/pgs_util.h
similarity index 100%
rename from pgs_util.h
rename to src/pgs_util.h
diff --git a/point.c b/src/point.c
similarity index 100%
rename from point.c
rename to src/point.c
diff --git a/point.h b/src/point.h
similarity index 100%
rename from point.h
rename to src/point.h
diff --git a/polygon.c b/src/polygon.c
similarity index 100%
rename from polygon.c
rename to src/polygon.c
diff --git a/polygon.h b/src/polygon.h
similarity index 100%
rename from polygon.h
rename to src/polygon.h
diff --git a/process_moc.cpp b/src/process_moc.cpp
similarity index 100%
rename from process_moc.cpp
rename to src/process_moc.cpp
diff --git a/sbuffer.c b/src/sbuffer.c
similarity index 100%
rename from sbuffer.c
rename to src/sbuffer.c
diff --git a/sbuffer.h b/src/sbuffer.h
similarity index 100%
rename from sbuffer.h
rename to src/sbuffer.h
diff --git a/sparse.c b/src/sparse.c
similarity index 100%
rename from sparse.c
rename to src/sparse.c
diff --git a/sparse.h b/src/sparse.h
similarity index 100%
rename from sparse.h
rename to src/sparse.h
diff --git a/sparse.y b/src/sparse.y
similarity index 100%
rename from sparse.y
rename to src/sparse.y
diff --git a/sscan.c b/src/sscan.c
similarity index 100%
rename from sscan.c
rename to src/sscan.c
diff --git a/sscan.l b/src/sscan.l
similarity index 100%
rename from sscan.l
rename to src/sscan.l
diff --git a/types.h b/src/types.h
similarity index 100%
rename from types.h
rename to src/types.h
diff --git a/vector3d.c b/src/vector3d.c
similarity index 100%
rename from vector3d.c
rename to src/vector3d.c
diff --git a/vector3d.h b/src/vector3d.h
similarity index 100%
rename from vector3d.h
rename to src/vector3d.h