diff --git a/geocoder/extension/Makefile b/geocoder/extension/Makefile
index a0ce595..d79a16c 100644
--- a/geocoder/extension/Makefile
+++ b/geocoder/extension/Makefile
@@ -1,3 +1,5 @@
+# Makefile to generate the extension out of separate sql source files.
+# Once a version is released, it is not meant to be changed. E.g: once version 0.0.1 is out, it SHALL NOT be changed.
 EXTENSION = cdb_geocoder
 EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
 
@@ -17,3 +19,7 @@ $(DATA): $(SOURCES_DATA)
 	cat $(SOURCES_DATA) >> $@
 
 all: $(DATA)
+
+# Only meant for development time, do not use once a version is released
+devclean:
+	rm -f $(DATA)
diff --git a/geocoder/extension/sql/0.0.1/00_header.sql b/geocoder/extension/sql/0.0.1/00_header.sql
new file mode 100644
index 0000000..94ac67c
--- /dev/null
+++ b/geocoder/extension/sql/0.0.1/00_header.sql
@@ -0,0 +1,2 @@
+-- Complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION cdb_geocoder" to load this file. \quit
diff --git a/geocoder/extension/sql/0.0.1/cdb_geocoder_admin0.sql b/geocoder/extension/sql/0.0.1/10_admin0.sql
similarity index 98%
rename from geocoder/extension/sql/0.0.1/cdb_geocoder_admin0.sql
rename to geocoder/extension/sql/0.0.1/10_admin0.sql
index ba53e19..100ff49 100644
--- a/geocoder/extension/sql/0.0.1/cdb_geocoder_admin0.sql
+++ b/geocoder/extension/sql/0.0.1/10_admin0.sql
@@ -1,6 +1,3 @@
--- Complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION cdb_geocoder_admin0" to load this file. \quit
-
 -- Response types for admin0 geocoder
 CREATE TYPE geocode_admin_v1 AS (q TEXT, geom GEOMETRY, success BOOLEAN);
 CREATE TYPE synonym_lookup_v1 AS (q TEXT, adm0_a3 TEXT);