diff --git a/client/.gitignore b/client/.gitignore
new file mode 100644
index 0000000..e710f0e
--- /dev/null
+++ b/client/.gitignore
@@ -0,0 +1,3 @@
+results/
+regression.diffs
+regression.out
diff --git a/lib/python/heremaps/__init__.py b/client/Makefile
similarity index 100%
rename from lib/python/heremaps/__init__.py
rename to client/Makefile
diff --git a/client/README.md b/client/README.md
new file mode 100644
index 0000000..c4e8032
--- /dev/null
+++ b/client/README.md
@@ -0,0 +1,2 @@
+# Geocoder API Client
+The CartoDB Geocoder SQL API client
diff --git a/lib/python/heremaps/tests/__init__.py b/client/cdb_geocoder_client.control
similarity index 100%
rename from lib/python/heremaps/tests/__init__.py
rename to client/cdb_geocoder_client.control
diff --git a/server/.gitignore b/server/.gitignore
new file mode 100644
index 0000000..e710f0e
--- /dev/null
+++ b/server/.gitignore
@@ -0,0 +1,3 @@
+results/
+regression.diffs
+regression.out
diff --git a/server/Makefile b/server/Makefile
new file mode 100644
index 0000000..e69de29
diff --git a/server/README.md b/server/README.md
new file mode 100644
index 0000000..72af5d8
--- /dev/null
+++ b/server/README.md
@@ -0,0 +1,2 @@
+# Geocoder API Server
+The CartoDB Geocoder SQL API server
diff --git a/server/cdb_geocoder_server.control b/server/cdb_geocoder_server.control
new file mode 100644
index 0000000..e69de29
diff --git a/server/lib/python/heremaps/__init__.py b/server/lib/python/heremaps/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/python/heremaps/heremapsexceptions.py b/server/lib/python/heremaps/heremapsexceptions.py
similarity index 100%
rename from lib/python/heremaps/heremapsexceptions.py
rename to server/lib/python/heremaps/heremapsexceptions.py
diff --git a/lib/python/heremaps/heremapsgeocoder.py b/server/lib/python/heremaps/heremapsgeocoder.py
similarity index 100%
rename from lib/python/heremaps/heremapsgeocoder.py
rename to server/lib/python/heremaps/heremapsgeocoder.py
diff --git a/server/lib/python/heremaps/tests/__init__.py b/server/lib/python/heremaps/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/lib/python/heremaps/tests/heremapsgeocoder_tests.py b/server/lib/python/heremaps/tests/heremapsgeocoder_tests.py
similarity index 100%
rename from lib/python/heremaps/tests/heremapsgeocoder_tests.py
rename to server/lib/python/heremaps/tests/heremapsgeocoder_tests.py