diff --git a/build/build.ml b/build/build.ml
index 34fb034299..593dc52bb7 100644
--- a/build/build.ml
+++ b/build/build.ml
@@ -15,9 +15,9 @@ module Intern = struct
   end
 
   let with_package = function
-    | "eliom.ppx.type" -> "pkg_ppx_eliom_types"
-    | "eliom.ppx.client"
-    | "eliom.ppx.server"
+    | "ppx_eliom.ppx.type" -> "pkg_ppx_eliom_types"
+    | "ppx_eliom.ppx.client"
+    | "ppx_eliom.ppx.server"
     | "eliom.syntax.predef"
     | "eliom.client"
     | "eliom.server" -> (* do noting in this case *) "pkg_dummy"
diff --git a/dune-project b/dune-project
new file mode 100644
index 0000000000..fa5a9e4075
--- /dev/null
+++ b/dune-project
@@ -0,0 +1 @@
+(lang dune 1.8.2)
\ No newline at end of file
diff --git a/opam b/eliom.opam
similarity index 90%
rename from opam
rename to eliom.opam
index a1c00f448f..9a3d5d6c3f 100644
--- a/opam
+++ b/eliom.opam
@@ -9,13 +9,21 @@ homepage: "http://ocsigen.org/eliom/"
 bug-reports: "https://github.com/ocsigen/eliom/issues/"
 license: "LGPL-2.1 with OCaml linking exception"
 dev-repo: "git+https://github.com/ocsigen/eliom.git"
-build: [make]
+build: [
+  ["dune" "build" "--profile" "release"]
+]
+install: [
+  ["dune" "install"]
+]
 depends: [
+  "dune"
   "ocaml" {>= "4.06.1"}
   "ocamlfind"
   "deriving" {>= "0.6"}
   "ppx_deriving"
   "ppx_tools" {>= "0.99.3"}
+  "ppx_eliom" {>= "1.0.0"}
+  "eliom_camlp4"
   "js_of_ocaml" {>= "3.3"}
   "js_of_ocaml-lwt" {>= "3.3"}
   "js_of_ocaml-ocamlbuild" {build}
diff --git a/pkg/META b/pkg/META
deleted file mode 100644
index 7ab2a4d2d0..0000000000
--- a/pkg/META
+++ /dev/null
@@ -1,138 +0,0 @@
-description = "Eliom: client-server Web and mobile applications"
-version = "6.3.0"
-
-package "server" (
-  description = "Eliom: server-side"
-  version = "[distributed with Eliom]"
-  directory = "server"
-
-  requires = "ocsigenserver,
-              ocsigenserver.ext,
-              ppx_deriving.runtime,
-              js_of_ocaml.deriving,
-              react,
-              reactiveData,
-              tyxml,
-              lwt_react,
-              cryptokit,
-              reactiveData"
-  archive(byte) = "server.cma"
-  archive(native) = "server.cmxa"
-
-  package "monitor" (
-    directory = "monitor"
-    description = "Eliom: monitoring"
-    version = "[distributed with Eliom]"
-    archive(byte) = "eliom_monitor.cma"
-    archive(native) = "eliom_monitor.cmxa"
-    package "start" (
-      description = "Eliom: monitoring"
-      version = "[distributed with Eliom]"
-      require = "eliom.server.monitor"
-      archive(byte) = "eliom_monitor_main.cma"
-      archive(native) = "eliom_monitor_main.cmxa"
-    )
-  )
-)
-
-package "client" (
-  description = "Eliom: client-side"
-  version = "[distributed with Eliom]"
-  directory = "client"
-
-  requires = "ocsigenserver.cookies,
-              ocsigenserver.polytables,
-              ocsigenserver.baselib.base,
-              ppx_deriving.runtime,
-              js_of_ocaml,
-              js_of_ocaml.deriving,
-              js_of_ocaml-tyxml,
-              js_of_ocaml-lwt,
-              js_of_ocaml-lwt.logger,
-              js_of_ocaml.weak,
-              lwt_react,
-              react,
-              reactiveData,
-              tyxml.functor"
-  archive(byte) = "client.cma eliom_client_main.cmo"
-
-  linkopts(javascript) = "+eliom.client/eliom_client.js"
-)
-
-package "syntax" (
-  directory = "syntax"
-  package "common" (
-    description = "Syntax extension: spliting client and server code (base)"
-    version = "[distributed with Eliom]"
-    requires = "camlp4, bytes"
-    requires(preprocessor, syntax, pkg_type_conv) = "type_conv"
-    archive(syntax, preprocessor) = "pa_eliom_seed.cmo"
-  )
-
-  package "client" (
-    description = "Syntax extension: spliting client and server code (client side)"
-    version = "[distributed with Eliom]"
-    requires(syntax, preprocessor) = "eliom.syntax.common"
-    requires(syntax, toploop) = "eliom.syntax.common"
-    archive(syntax, preprocessor) = "pa_eliom_client_client.cmo"
-    archive(syntax, toploop) = "pa_eliom_client_client.cmo"
-  )
-
-  package "server" (
-    description = "Syntax extension: spliting client and server code (server side)"
-    version = "[distributed with Eliom]"
-    requires(syntax, preprocessor) = "eliom.syntax.common"
-    requires(syntax, toploop) = "eliom.syntax.common"
-    archive(syntax, preprocessor) = "pa_eliom_client_server.cmo"
-    archive(syntax, toploop) = "pa_eliom_client_server.cmo"
-  )
-
-  package "type" (
-    description = "Syntax extension: spliting client and server code (type inference)"
-    version = "[distributed with Eliom]"
-    requires(syntax, preprocessor) = "eliom.syntax.common"
-    archive(syntax, preprocessor) = "pa_eliom_type_filter.cmo"
-  )
-
-  package "predef" (
-    description = "Syntax extension: predefined commonly use syntaxes"
-    version = "[distributed with Eliom]"
-
-    requires(syntax, preprocessor) = "js_of_ocaml-camlp4,js_of_ocaml-camlp4.deriving,lwt_camlp4"
-    requires(syntax, toploop) = "js_of_ocaml-camlp4,js_of_ocaml-camlp4.deriving,lwt_camlp4"
-    archive(syntax, preprocessor) = "-ignore dummy"
-  )
-
-)
-
-package "ppx" (
-  directory = "ppx"
-  package "server" (
-    description = "Ppx syntax extension: server side"
-    ppx = "ppx_eliom_server"
-  )
-  package "client" (
-    description = "Ppx syntax extension: client side"
-    ppx = "ppx_eliom_client"
-  )
-  package "type" (
-    description = "Ppx syntax extension: type inference"
-    ppx = "ppx_eliom_types"
-  )
-)
-
-
-package "templates" (
-  directory = "templates"
-)
-
-package "ocamlbuild" (
-  description = "Eliom ocamlbuild plugin (js_of_ocaml part included)"
-  version = "[distributed with Eliom]"
-  directory = "ocamlbuild"
-  requires = "js_of_ocaml.ocamlbuild"
-  archive(byte) = "ocamlbuild_eliom.cma"
-  archive(byte, plugin) = "ocamlbuild_eliom.cma"
-  archive(native) = "ocamlbuild_eliom.cmxa"
-  archive(native, plugin) = "ocamlbuild_eliom.cmxs"
-)
diff --git a/pkg/build.ml b/pkg/build.ml
deleted file mode 100755
index ba03dec607..0000000000
--- a/pkg/build.ml
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env ocaml
-#directory "pkg";;
-#use "topkg.ml";;
-#use "filelist.ml"
-
-(* DEBUG ONLY *)
-let nothing_should_be_rebuilt=false
-let except = function
-  (* cmxs are regerated every time ( bug in ocamlbuild rule) *)
-  | ".cmxs" when nothing_should_be_rebuilt -> false
-  | _ -> true
-(* END *)
-
-let exts_syntax = List.filter except [".cmo";".cmx";".cma";".cmxa";".cmxs";".a"]
-let exts_modlib = List.filter except Exts.module_library
-let exts_lib = List.filter except Exts.library
-
-let _ =
-  list_to_file "src/lib/client/client.mllib" client_mllib;
-  list_to_file "src/lib/client/api.odocl" client_api;
-
-  list_to_file "src/lib/server/server.mllib" server_mllib;
-  list_to_file "src/lib/server/server.mldylib" server_mllib;
-  list_to_file "src/lib/server/api.odocl" server_api;
-
-  list_to_file "src/ocamlbuild/ocamlbuild.mllib" ocamlbuild_mllib;
-  list_to_file "src/ocamlbuild/ocamlbuild.mldylib" ocamlbuild_mllib;
-  list_to_file "src/ocamlbuild/api.odocl" ocamlbuild_api;
-
-  list_to_file "src/ppx/ppx.mllib" ppx_mllib;
-  list_to_file "src/ppx/ppx.mldylib" ppx_mllib;
-  list_to_file "src/ppx/api.odocl" ppx_api;
-
-  list_to_file "src/ppx/ppx.mllib" ppx_mllib;
-  list_to_file "src/ppx/ppx.mldylib" ppx_mllib;
-  list_to_file "src/ppx/api.odocl" ppx_api
-
-let spf = Printf.sprintf
-
-let nothing =
-  if nothing_should_be_rebuilt
-  then "-nothing-should-be-rebuilt"
-  else ""
-
-let builder = `Other ("_build/build/build.native","_build")
-
-let with_man3 = Env.bool "manpage"
-
-let () =
-  Pkg.describe "eliom" ~builder ([
-    (* META *)
-    Pkg.lib "pkg/META";
-
-    (* MANPAGE *)
-    Pkg.man ~dst:"man1/eliomc.1" "pkg/man/eliomc.1";
-    Pkg.man ~dst:"man1/eliomcp.1" "pkg/man/eliomc.1";
-    Pkg.man ~dst:"man1/eliomopt.1" "pkg/man/eliomc.1";
-    Pkg.man ~dst:"man1/eliomdep.1" "pkg/man/eliomc.1";
-    Pkg.man ~dst:"man1/js_of_eliom.1" "pkg/man/eliomc.1";
-    Pkg.man ~dst:"man1/eliom-distillery.1" "pkg/man/eliom-distillery.1";
-
-    Pkg.man ~cond:with_man3 ~dst:"man3/%.3oc" ~target:"src/lib/client/api.mandocdir/man.3oc" "src/lib/client/api.mandocdir/%.3oc";
-    Pkg.man ~cond:with_man3 ~dst:"man3/%.3os" ~target:"src/lib/server/api.mandocdir/man.3os" "src/lib/server/api.mandocdir/%.3os";
-    Pkg.man ~cond:with_man3 ~dst:"man3/%.3o"  ~target:"src/ocamlbuild/api.mandocdir/man.3o"  "src/ocamlbuild/api.mandocdir/%.3o";
-    Pkg.man ~cond:with_man3 ~dst:"man3/%.3o"  ~target:"src/ppx/api.mandocdir/man.3o"  "src/ppx/api.mandocdir/%.3o";
-
-    (* TOOLS *)
-    Pkg.bin ~auto:true "src/tools/eliomc";
-    Pkg.bin ~auto:true "src/tools/eliomcp";
-    Pkg.bin ~auto:true "src/tools/eliomdep";
-    Pkg.bin ~auto:true "src/tools/eliomopt";
-    Pkg.bin ~auto:true "src/tools/js_of_eliom";
-    Pkg.bin ~auto:true "src/tools/eliomdoc";
-    Pkg.bin ~auto:true "src/tools/eliompp";
-    Pkg.bin ~auto:true ~dst:"eliom-distillery" "src/tools/distillery";
-    Pkg.bin ~auto:true "src/ocamlbuild/eliombuild";
-
-    (* SYNTAXES *)
-    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_seed" "src/syntax/pa_eliom_seed";
-    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_client_client" "src/syntax/pa_eliom_client_client";
-    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_client_server" "src/syntax/pa_eliom_client_server";
-    Pkg.lib ~exts:exts_syntax ~dst:"syntax/pa_eliom_type_filter" "src/syntax/pa_eliom_type_filter";
-
-    Pkg.lib ~exts:exts_modlib ~dst:"ocamlbuild/ocamlbuild_eliom" "src/ocamlbuild/ocamlbuild_eliom";
-
-    (* PPX *)
-    Pkg.lib ~exts:Exts.module_library ~dst:"ppx/ppx_eliom" "src/ppx/ppx_eliom";
-    Pkg.lib ~exts:Exts.module_library ~dst:"ppx/ppx_eliom_client" "src/ppx/ppx_eliom_client";
-    Pkg.lib ~exts:Exts.module_library ~dst:"ppx/ppx_eliom_type" "src/ppx/ppx_eliom_type";
-    Pkg.lib ~exts:Exts.module_library ~dst:"ppx/ppx_eliom_server" "src/ppx/ppx_eliom_server";
-
-    Pkg.bin ~auto:true ~dst:"ppx_eliom_client" "src/ppx/ppx_eliom_client_ex" ;
-    Pkg.bin ~auto:true ~dst:"ppx_eliom_server" "src/ppx/ppx_eliom_server_ex" ;
-    Pkg.bin ~auto:true ~dst:"ppx_eliom_types" "src/ppx/ppx_eliom_types_ex"
-
-  ] @ (
-    (* CLIENT LIBS *)
-    Pkg.lib ~dst:"client/client" ~exts:[".cma"] "src/lib/client/client" ::
-    Pkg.lib ~dst:"client/eliom_client_main.cmo" "src/lib/client/eliom_client_main.cmo" ::
-    Pkg.lib ~dst:"client/eliom_client.js" "src/lib/client/eliom_client.js" ::
-    List.map (fun x -> Pkg.lib ~dst:(spf "client/%s" x) (spf "src/lib/client/%s" x)) client_extra
-  ) @ (
-    (* SERVER LIBS *)
-    Pkg.lib ~dst:"server/monitor/eliom_monitor" ~exts:Exts.module_library "src/lib/server/monitor/eliom_monitor" ::
-    Pkg.lib ~dst:"server/monitor/eliom_monitor_main" ~exts:Exts.module_library "src/lib/server/monitor/eliom_monitor_main" ::
-    Pkg.lib ~dst:"server/server" ~exts:exts_lib "src/lib/server/server" ::
-    List.map (fun x -> Pkg.lib ~dst:(spf "server/%s" x) (spf "src/lib/server/%s" x)) server_extra
-  ) @ [
-    (* MISC *)
-
-    Pkg.doc "README.md";
-    Pkg.doc "CHANGES";
-    Pkg.etc "pkg/etc/mime.types"
-  ] @ (
-    List.flatten (
-      List.map (fun (name,files) ->
-          List.map (fun file ->
-              Pkg.lib ~dst:(spf "templates/%s/%s" name file) (spf "%s/%s/%s" templates_dir name file)
-            ) files) templates_files )
-  ))
diff --git a/pkg/distillery/basic.camlp4/.ocp-indent b/pkg/distillery/basic.camlp4/.ocp-indent
deleted file mode 100644
index e98972dec4..0000000000
--- a/pkg/distillery/basic.camlp4/.ocp-indent
+++ /dev/null
@@ -1,4 +0,0 @@
-normal
-with=0
-syntax=lwt mll
-max_indent=2
diff --git a/pkg/distillery/basic.camlp4/Makefile b/pkg/distillery/basic.camlp4/Makefile
deleted file mode 100644
index adfeb11620..0000000000
--- a/pkg/distillery/basic.camlp4/Makefile
+++ /dev/null
@@ -1,240 +0,0 @@
-
-##----------------------------------------------------------------------
-## DISCLAIMER
-##
-## This file contains the rules to make an Eliom project. The project is
-## configured through the variables in the file Makefile.options.
-##----------------------------------------------------------------------
-
-include Makefile.options
-
-##----------------------------------------------------------------------
-##			      Internals
-
-## Required binaries
-ELIOMC            := eliomc
-ELIOMOPT          := eliomopt
-JS_OF_ELIOM       := js_of_eliom
-ELIOMDEP          := eliomdep
-OCSIGENSERVER     := ocsigenserver
-OCSIGENSERVER.OPT := ocsigenserver.opt
-
-## Where to put intermediate object files.
-## - ELIOM_{SERVER,CLIENT}_DIR must be distinct
-## - ELIOM_CLIENT_DIR must not be the local dir.
-## - ELIOM_SERVER_DIR could be ".", but you need to
-##   remove it from the "clean" rules...
-export ELIOM_SERVER_DIR := _server
-export ELIOM_CLIENT_DIR := _client
-export ELIOM_TYPE_DIR   := _server
-DEPSDIR := _deps
-
-ifeq ($(DEBUG),yes)
-  GENERATE_DEBUG ?= -g
-  RUN_DEBUG ?= "-v"
-  DEBUG_JS ?= -jsopt -pretty -jsopt -noinline -jsopt -debuginfo
-endif
-
-##----------------------------------------------------------------------
-## General
-
-.PHONY: all byte opt
-all: byte opt
-byte opt:: $(TEST_PREFIX)$(ELIOMSTATICDIR)/${PROJECT_NAME}.js
-byte opt:: $(TEST_PREFIX)$(ETCDIR)/$(PROJECT_NAME).conf
-byte opt:: $(TEST_PREFIX)$(ETCDIR)/$(PROJECT_NAME)-test.conf
-byte:: $(TEST_PREFIX)$(LIBDIR)/${PROJECT_NAME}.cma
-opt:: $(TEST_PREFIX)$(LIBDIR)/${PROJECT_NAME}.cmxs
-
-DIST_DIRS = $(ETCDIR) $(DATADIR) $(LIBDIR) $(LOGDIR) $(STATICDIR) $(ELIOMSTATICDIR) $(shell dirname $(CMDPIPE))
-
-##----------------------------------------------------------------------
-## Testing
-
-DIST_FILES = $(ELIOMSTATICDIR)/$(PROJECT_NAME).js $(LIBDIR)/$(PROJECT_NAME).cma
-
-.PHONY: test.byte test.opt
-test.byte: $(addprefix $(TEST_PREFIX),$(ETCDIR)/$(PROJECT_NAME)-test.conf $(DIST_DIRS) $(DIST_FILES))
-	$(OCSIGENSERVER) $(RUN_DEBUG) -c $<
-test.opt: $(addprefix $(TEST_PREFIX),$(ETCDIR)/$(PROJECT_NAME)-test.conf $(DIST_DIRS) $(patsubst %.cma,%.cmxs, $(DIST_FILES)))
-	$(OCSIGENSERVER.OPT) $(RUN_DEBUG) -c $<
-
-$(addprefix $(TEST_PREFIX), $(DIST_DIRS)):
-	mkdir -p $@
-
-##----------------------------------------------------------------------
-## Installing & Running
-
-.PHONY: install install.byte install.byte install.opt install.static install.etc install.lib install.lib.byte install.lib.opt run.byte run.opt
-install: install.byte install.opt
-install.byte: install.lib.byte install.etc install.static | $(addprefix $(PREFIX),$(DATADIR) $(LOGDIR) $(shell dirname $(CMDPIPE)))
-install.opt: install.lib.opt install.etc install.static | $(addprefix $(PREFIX),$(DATADIR) $(LOGDIR) $(shell dirname $(CMDPIPE)))
-install.lib: install.lib.byte install.lib.opt
-install.lib.byte: $(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cma | $(PREFIX)$(LIBDIR)
-	install $< $(PREFIX)$(LIBDIR)
-install.lib.opt: $(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cmxs | $(PREFIX)$(LIBDIR)
-	install $< $(PREFIX)$(LIBDIR)
-install.static: $(TEST_PREFIX)$(ELIOMSTATICDIR)/$(PROJECT_NAME).js | $(PREFIX)$(STATICDIR) $(PREFIX)$(ELIOMSTATICDIR)
-	cp -r $(LOCAL_STATIC)/* $(PREFIX)$(STATICDIR)
-	[ -z $(WWWUSER) ] || chown -R $(WWWUSER) $(PREFIX)$(STATICDIR)
-	install $(addprefix -o ,$(WWWUSER)) $< $(PREFIX)$(ELIOMSTATICDIR)
-install.etc: $(TEST_PREFIX)$(ETCDIR)/$(PROJECT_NAME).conf | $(PREFIX)$(ETCDIR)
-	install $< $(PREFIX)$(ETCDIR)/$(PROJECT_NAME).conf
-
-.PHONY:
-print-install-files:
-	@echo $(PREFIX)$(LIBDIR)
-	@echo $(PREFIX)$(STATICDIR)
-	@echo $(PREFIX)$(ELIOMSTATICDIR)
-	@echo $(PREFIX)$(ETCDIR)
-
-$(addprefix $(PREFIX),$(ETCDIR) $(LIBDIR)):
-	install -d $@
-$(addprefix $(PREFIX),$(DATADIR) $(LOGDIR) $(STATICDIR) $(ELIOMSTATICDIR) $(shell dirname $(CMDPIPE))):
-	install $(addprefix -o ,$(WWWUSER)) -d $@
-
-run.byte:
-	$(OCSIGENSERVER) $(RUN_DEBUG) -c ${PREFIX}${ETCDIR}/${PROJECT_NAME}.conf
-run.opt:
-	$(OCSIGENSERVER.OPT) $(RUN_DEBUG) -c ${PREFIX}${ETCDIR}/${PROJECT_NAME}.conf
-
-##----------------------------------------------------------------------
-## Aux
-
-# Use `eliomdep -sort' only in OCaml>4
-ifeq ($(shell ocamlc -version|cut -c1),4)
-eliomdep=$(shell $(ELIOMDEP) $(1) -sort $(2) $(filter %.eliom %.ml,$(3))))
-else
-eliomdep=$(3)
-endif
-objs=$(patsubst %.ml,$(1)/%.$(2),$(patsubst %.eliom,$(1)/%.$(2),$(filter %.eliom %.ml,$(3))))
-depsort=$(call objs,$(1),$(2),$(call eliomdep,$(3),$(4),$(5)))
-
-##----------------------------------------------------------------------
-## Config files
-
-FINDLIB_PACKAGES=$(patsubst %,\<extension\ findlib-package=\"%\"\ /\>,$(SERVER_PACKAGES))
-EDIT_WARNING=DON\'T EDIT THIS FILE! It is generated from $(PROJECT_NAME).conf.in, edit that one, or the variables in Makefile.options
-SED_ARGS := -e "/^ *%%%/d"
-SED_ARGS += -e "s|%%PROJECT_NAME%%|$(PROJECT_NAME)|g"
-SED_ARGS += -e "s|%%DATABASE_NAME%%|$(DATABASE_NAME)|g"
-SED_ARGS += -e "s|%%DATABASE_USER%%|$(DATABASE_USER)|g"
-SED_ARGS += -e "s|%%CMDPIPE%%|%%PREFIX%%$(CMDPIPE)|g"
-SED_ARGS += -e "s|%%LOGDIR%%|%%PREFIX%%$(LOGDIR)|g"
-SED_ARGS += -e "s|%%DATADIR%%|%%PREFIX%%$(DATADIR)|g"
-SED_ARGS += -e "s|%%PERSISTENT_DATA_BACKEND%%|$(PERSISTENT_DATA_BACKEND)|g"
-SED_ARGS += -e "s|%%LIBDIR%%|%%PREFIX%%$(LIBDIR)|g"
-SED_ARGS += -e "s|%%WARNING%%|$(EDIT_WARNING)|g"
-SED_ARGS += -e "s|%%PACKAGES%%|$(FINDLIB_PACKAGES)|g"
-SED_ARGS += -e "s|%%ELIOMSTATICDIR%%|%%PREFIX%%$(ELIOMSTATICDIR)|g"
-ifeq ($(DEBUG),yes)
-  SED_ARGS += -e "s|%%DEBUGMODE%%|\<debugmode /\>|g"
-else
-  SED_ARGS += -e "s|%%DEBUGMODE%%||g"
-endif
-
-LOCAL_SED_ARGS := -e "s|%%PORT%%|$(TEST_PORT)|g"
-LOCAL_SED_ARGS += -e "s|%%STATICDIR%%|$(LOCAL_STATIC)|g"
-LOCAL_SED_ARGS += -e "s|%%USERGROUP%%||g"
-GLOBAL_SED_ARGS := -e "s|%%PORT%%|$(PORT)|g"
-GLOBAL_SED_ARGS += -e "s|%%STATICDIR%%|%%PREFIX%%$(STATICDIR)|g"
-ifeq ($(WWWUSER)$(WWWGROUP),)
-  GLOBAL_SED_ARGS += -e "s|%%USERGROUP%%||g"
-else
-  GLOBAL_SED_ARGS += -e "s|%%USERGROUP%%|<user>$(WWWUSER)</user><group>$(WWWGROUP)</group>|g"
-endif
-
-$(TEST_PREFIX)${ETCDIR}/${PROJECT_NAME}.conf: ${PROJECT_NAME}.conf.in Makefile.options | $(TEST_PREFIX)$(ETCDIR)
-	sed $(SED_ARGS) $(GLOBAL_SED_ARGS) $< | sed -e "s|%%PREFIX%%|$(PREFIX)|g" > $@
-$(TEST_PREFIX)${ETCDIR}/${PROJECT_NAME}-test.conf: ${PROJECT_NAME}.conf.in Makefile.options | $(TEST_PREFIX)$(ETCDIR)
-	sed $(SED_ARGS) $(LOCAL_SED_ARGS) $< | sed -e "s|%%PREFIX%%|$(TEST_PREFIX)|g" > $@
-
-##----------------------------------------------------------------------
-## Server side compilation
-
-SERVER_INC  := ${addprefix -package ,${SERVER_PACKAGES}}
-
-${ELIOM_TYPE_DIR}/%.type_mli: %.eliom
-	${ELIOMC} -infer ${SERVER_INC} $<
-
-$(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cma: $(call objs,$(ELIOM_SERVER_DIR),cmo,$(SERVER_FILES)) | $(TEST_PREFIX)$(LIBDIR)
-	${ELIOMC} -a -o $@ $(GENERATE_DEBUG) \
-          $(call depsort,$(ELIOM_SERVER_DIR),cmo,-server,$(SERVER_INC),$(SERVER_FILES))
-
-$(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cmxa: $(call objs,$(ELIOM_SERVER_DIR),cmx,$(SERVER_FILES)) | $(TEST_PREFIX)$(LIBDIR)
-	${ELIOMOPT} -a -o $@ $(GENERATE_DEBUG) \
-          $(call depsort,$(ELIOM_SERVER_DIR),cmx,-server,$(SERVER_INC),$(SERVER_FILES))
-
-%.cmxs: %.cmxa
-	$(ELIOMOPT) -shared -linkall -o $@ $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmi: %.mli
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmi: %.eliomi
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmo: %.ml
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-${ELIOM_SERVER_DIR}/%.cmo: %.eliom
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmx: %.ml
-	${ELIOMOPT} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-${ELIOM_SERVER_DIR}/%.cmx: %.eliom
-	${ELIOMOPT} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-
-##----------------------------------------------------------------------
-## Client side compilation
-
-CLIENT_LIBS := ${addprefix -package ,${CLIENT_PACKAGES}}
-CLIENT_INC  := ${addprefix -package ,${CLIENT_PACKAGES}}
-
-CLIENT_OBJS := $(filter %.eliom %.ml, $(CLIENT_FILES))
-CLIENT_OBJS := $(patsubst %.eliom,${ELIOM_CLIENT_DIR}/%.cmo, ${CLIENT_OBJS})
-CLIENT_OBJS := $(patsubst %.ml,${ELIOM_CLIENT_DIR}/%.cmo, ${CLIENT_OBJS})
-
-$(TEST_PREFIX)$(ELIOMSTATICDIR)/$(PROJECT_NAME).js: $(call objs,$(ELIOM_CLIENT_DIR),cmo,$(CLIENT_FILES)) | $(TEST_PREFIX)$(ELIOMSTATICDIR)
-	${JS_OF_ELIOM} -o $@ $(GENERATE_DEBUG) $(CLIENT_INC) $(DEBUG_JS) \
-          $(call depsort,$(ELIOM_CLIENT_DIR),cmo,-client,$(CLIENT_INC),$(CLIENT_FILES))
-
-${ELIOM_CLIENT_DIR}/%.cmi: %.mli
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_CLIENT_DIR}/%.cmo: %.eliom
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-${ELIOM_CLIENT_DIR}/%.cmo: %.ml
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_CLIENT_DIR}/%.cmi: %.eliomi
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-
-##----------------------------------------------------------------------
-## Dependencies
-
-include .depend
-
-.depend: $(patsubst %,$(DEPSDIR)/%.server,$(SERVER_FILES)) $(patsubst %,$(DEPSDIR)/%.client,$(CLIENT_FILES))
-	cat $^ > $@
-
-$(DEPSDIR)/%.server: % | $(DEPSDIR)
-	$(ELIOMDEP) -server $(SERVER_INC) $< > $@
-
-$(DEPSDIR)/%.client: % | $(DEPSDIR)
-	$(ELIOMDEP) -client $(CLIENT_INC) $< > $@
-
-$(DEPSDIR):
-	mkdir $@
-
-##----------------------------------------------------------------------
-## Clean up
-
-clean:
-	-rm -f *.cm[ioax] *.cmxa *.cmxs *.o *.a *.annot
-	-rm -f *.type_mli
-	-rm -f ${PROJECT_NAME}.js
-	-rm -rf ${ELIOM_CLIENT_DIR} ${ELIOM_SERVER_DIR}
-
-distclean: clean
-	-rm -rf $(TEST_PREFIX) $(DEPSDIR) .depend
diff --git a/pkg/distillery/basic.camlp4/Makefile.options b/pkg/distillery/basic.camlp4/Makefile.options
deleted file mode 100644
index 3a451650b1..0000000000
--- a/pkg/distillery/basic.camlp4/Makefile.options
+++ /dev/null
@@ -1,64 +0,0 @@
-
-#----------------------------------------------------------------------
-#           SETTINGS FOR THE ELIOM PROJECT %%%PROJECT_NAME%%%
-#----------------------------------------------------------------------
-
-PROJECT_NAME := %%%PROJECT_NAME%%%
-
-# Source files for the server
-SERVER_FILES := $(wildcard *.eliomi *.eliom)
-# Source files for the client
-CLIENT_FILES := $(wildcard *.eliomi *.eliom)
-
-# OCamlfind packages for the server
-SERVER_PACKAGES :=
-# OCamlfind packages for the client
-CLIENT_PACKAGES :=
-
-# Directory with files to be statically served
-LOCAL_STATIC = static
-
-# The backend for persistent data. Can be dbm or sqlite.
-# Make sure you have the following packages installed:
-# - *dbm* if you use dbm --> opam install dbm.
-# - *sqlite3* if you use sqlite --> opam install sqlite3.
-PERSISTENT_DATA_BACKEND = %%%PROJECT_DB%%%
-
-# Debug application (yes/no): Debugging info in compilation,
-# JavaScript, ocsigenserver
-DEBUG := no
-
-# User to run server with (make run.*)
-WWWUSER := www-data
-WWWGROUP := www-data
-
-# Port for running the server (make run.*)
-PORT := 80
-
-# Port for testing (make test.*)
-TEST_PORT := 8080
-
-# Root of installation (must end with /)
-PREFIX := /usr/local/
-
-# Local folder for make test.* (must end with /)
-# Do not add files manually in this directory.
-# It is just here to test your installation before installing in /
-TEST_PREFIX := local/
-
-# The installation tree (relative to $(PREFIX) when
-# installing/running or $(TEST_PREFIX) when testing).
-# Configuration file $(PROJECT_NAME).conf
-ETCDIR := etc/${PROJECT_NAME}
-# Project's library $(PROJECT_NAME).cma (cmxs)
-LIBDIR := lib/${PROJECT_NAME}
-# Command pipe, eg. $ echo reload > $(INSTALL_PREFIX)$(CMDPIPE)
-CMDPIPE := var/run/${PROJECT_NAME}-cmd
-# Ocsigenserver's logging files
-LOGDIR := var/log/${PROJECT_NAME}
-# Ocsigenserver's persistent data files
-DATADIR := var/data/${PROJECT_NAME}
-# Copy of $(LOCAL_STATIC)
-STATICDIR := var/www/${PROJECT_NAME}/static
-# Project's JavaScript file
-ELIOMSTATICDIR := var/www/${PROJECT_NAME}/eliom
diff --git a/pkg/distillery/basic.camlp4/PROJECT_NAME.conf.in b/pkg/distillery/basic.camlp4/PROJECT_NAME.conf.in
deleted file mode 100644
index 13a8a1fdbb..0000000000
--- a/pkg/distillery/basic.camlp4/PROJECT_NAME.conf.in
+++ /dev/null
@@ -1,28 +0,0 @@
-%%% This is the template for your configuration file. The %%VALUES%% below are
-%%% taken from the Makefile to generate the actual configuration files.
-%%% This comment will disappear.
-<!-- %%WARNING%% -->
-<ocsigen>
-  <server>
-    <port>%%PORT%%</port>
-    %%% Only set for running, not for testing
-    %%USERGROUP%%
-    <logdir>%%LOGDIR%%</logdir>
-    <datadir>%%DATADIR%%</datadir>
-    <charset>utf-8</charset>
-    %%% Only set when debugging
-    %%DEBUGMODE%%
-    <commandpipe>%%CMDPIPE%%</commandpipe>
-    <extension findlib-package="ocsigenserver.ext.staticmod"/>
-    <extension findlib-package="ocsigenserver.ext.ocsipersist-%%PERSISTENT_DATA_BACKEND%%"/>
-    <extension findlib-package="eliom.server"/>
-    %%% This will include the packages defined as SERVER_PACKAGES in your Makefile:
-    %%PACKAGES%%
-    <host hostfilter="*">
-      <static dir="%%STATICDIR%%" />
-      <static dir="%%ELIOMSTATICDIR%%" />
-      <eliommodule module="%%LIBDIR%%/%%PROJECT_NAME%%.cma" />
-      <eliom/>
-    </host>
-  </server>
-</ocsigen>
diff --git a/pkg/distillery/basic.camlp4/PROJECT_NAME.eliom b/pkg/distillery/basic.camlp4/PROJECT_NAME.eliom
deleted file mode 100644
index 0f7eec755e..0000000000
--- a/pkg/distillery/basic.camlp4/PROJECT_NAME.eliom
+++ /dev/null
@@ -1,30 +0,0 @@
-{shared{
-  open Eliom_lib
-  open Eliom_content
-  open Html.D
-}}
-
-module %%%MODULE_NAME%%%_app =
-  Eliom_registration.App (
-    struct
-      let application_name = "%%%PROJECT_NAME%%%"
-      let global_data_path = None
-    end)
-
-let main_service =
-  Eliom_service.create
-    ~path:(Eliom_service.Path [])
-    ~meth:(Eliom_service.Get Eliom_parameter.unit)
-    ()
-
-let () =
-  %%%MODULE_NAME%%%_app.register
-    ~service:main_service
-    (fun () () ->
-      Lwt.return
-        (Eliom_tools.F.html
-           ~title:"%%%PROJECT_NAME%%%"
-           ~css:[["css";"%%%PROJECT_NAME%%%.css"]]
-           Html.F.(body [
-             h1 [pcdata "Welcome from Eliom's distillery!"];
-           ])))
diff --git a/pkg/distillery/basic.camlp4/README b/pkg/distillery/basic.camlp4/README
deleted file mode 100644
index 6c48aa8af2..0000000000
--- a/pkg/distillery/basic.camlp4/README
+++ /dev/null
@@ -1,82 +0,0 @@
-
-Instructions
-============
-
-This project is (initially) generated by eliom-distillery as the basic
-project "%%%PROJECT_NAME%%%".
-
-Generally, you can compile it and run ocsigenserver on it by
-  $ make test.byte (or test.opt)
-See below for other useful targets for make.
-
-Generated files
----------------
-
-The following files in this directory have been generated by
-eliom-distillery:
-
- - %%%PROJECT_NAME%%%.eliom
-   This is your initial source file.
-%%%ifdef OCAML4%%%
-   All Eliom files (*.eliom, *.eliomi) in this directory are
-   automatically considered.  To add a .ml/.mli file to your project,
-   append it to the variable SERVER_FILES or CLIENT_FILES.
-%%%endif%%%
-%%%ifdef OCAML3%%%
-   To add more source files (.ml,.mli,.eliom,.eliomi) to your project,
-   add it to the variables SERVER_FILES and/or CLIENT_FILES.
-%%%endif%%%
-
- - static/
-   The content of this folder is statically served. Put your CSS or
-   additional JavaScript files here!
-
- - Makefile.options
-   Configure your project here!
-
- - %%%PROJECT_NAME%%%.conf.in
-   This file is a template for the configuration file for
-   ocsigenserver. You will rarely have to edit itself - it takes its
-   variables from the Makefile.options. This way, the installation
-   rules and the configuration files are synchronized with respect to
-   the different folders.
-
- - Makefile
-   This contains all rules necessary to build, test, and run your
-   Eliom application. You better don't touch it ;) See below for the
-   relevant targets.
-
- - local/
-   This directory is the target of the temporary installation of
-   your application, to test locally before doing a system-wide
-   installation in /. Do not put anything manually here.
-
- - README
-   Not completely describable here.
-
-
-Makefile targets
-----------------
-
-Here's some help on how to work with this basic distillery project:
-
- - Test your application by compiling it and running ocsigenserver locally
-     $ make test.byte (or test.opt)
-
- - Compile it only
-     $ make all (or byte or opt)
-
- - Deploy your project on your system
-     $ sudo make install (or install.byte or install.opt)
-
- - Run the server on the deployed project
-     $ sudo make run.byte (or run.opt)
-
-   If WWWUSER in the Makefile.options is you, you don't need the
-   `sudo'. If Eliom isn't installed globally, however, you need to
-   re-export some environment variables to make this work:
-     $ sudo PATH=$PATH OCAMLPATH=$OCAMLPATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH make run.byte/run.opt
-
- - If you need a findlib package in your project, add it to the
-   variables SERVER_PACKAGES and/or CLIENT_PACKAGES. The configuration
-   file will be automatically updated.
diff --git a/pkg/distillery/basic.camlp4/static!css!PROJECT_NAME.css b/pkg/distillery/basic.camlp4/static!css!PROJECT_NAME.css
deleted file mode 100644
index b71fa50add..0000000000
--- a/pkg/distillery/basic.camlp4/static!css!PROJECT_NAME.css
+++ /dev/null
@@ -1,3 +0,0 @@
-* {
-    font-family: sans-serif;
-}
diff --git a/pkg/distillery/basic.ppx/.ocp-indent b/pkg/distillery/basic.ppx/.ocp-indent
deleted file mode 100644
index ea41aa5457..0000000000
--- a/pkg/distillery/basic.ppx/.ocp-indent
+++ /dev/null
@@ -1,5 +0,0 @@
-normal
-with=0
-syntax=lwt mll
-max_indent=2
-ppx_stritem_ext=0
diff --git a/pkg/distillery/basic.ppx/Makefile b/pkg/distillery/basic.ppx/Makefile
deleted file mode 100644
index 8c47d3983d..0000000000
--- a/pkg/distillery/basic.ppx/Makefile
+++ /dev/null
@@ -1,240 +0,0 @@
-
-##----------------------------------------------------------------------
-## DISCLAIMER
-##
-## This file contains the rules to make an Eliom project. The project is
-## configured through the variables in the file Makefile.options.
-##----------------------------------------------------------------------
-
-include Makefile.options
-
-##----------------------------------------------------------------------
-##			      Internals
-
-## Required binaries
-ELIOMC            := eliomc -ppx
-ELIOMOPT          := eliomopt -ppx
-JS_OF_ELIOM       := js_of_eliom -ppx
-ELIOMDEP          := eliomdep
-OCSIGENSERVER     := ocsigenserver
-OCSIGENSERVER.OPT := ocsigenserver.opt
-
-## Where to put intermediate object files.
-## - ELIOM_{SERVER,CLIENT}_DIR must be distinct
-## - ELIOM_CLIENT_DIR must not be the local dir.
-## - ELIOM_SERVER_DIR could be ".", but you need to
-##   remove it from the "clean" rules...
-export ELIOM_SERVER_DIR := _server
-export ELIOM_CLIENT_DIR := _client
-export ELIOM_TYPE_DIR   := _server
-DEPSDIR := _deps
-
-ifeq ($(DEBUG),yes)
-  GENERATE_DEBUG ?= -g
-  RUN_DEBUG ?= "-v"
-  DEBUG_JS ?= -jsopt -pretty -jsopt -noinline -jsopt -debuginfo
-endif
-
-##----------------------------------------------------------------------
-## General
-
-.PHONY: all byte opt
-all: byte opt
-byte opt:: $(TEST_PREFIX)$(ELIOMSTATICDIR)/${PROJECT_NAME}.js
-byte opt:: $(TEST_PREFIX)$(ETCDIR)/$(PROJECT_NAME).conf
-byte opt:: $(TEST_PREFIX)$(ETCDIR)/$(PROJECT_NAME)-test.conf
-byte:: $(TEST_PREFIX)$(LIBDIR)/${PROJECT_NAME}.cma
-opt:: $(TEST_PREFIX)$(LIBDIR)/${PROJECT_NAME}.cmxs
-
-DIST_DIRS = $(ETCDIR) $(DATADIR) $(LIBDIR) $(LOGDIR) $(STATICDIR) $(ELIOMSTATICDIR) $(shell dirname $(CMDPIPE))
-
-##----------------------------------------------------------------------
-## Testing
-
-DIST_FILES = $(ELIOMSTATICDIR)/$(PROJECT_NAME).js $(LIBDIR)/$(PROJECT_NAME).cma
-
-.PHONY: test.byte test.opt
-test.byte: $(addprefix $(TEST_PREFIX),$(ETCDIR)/$(PROJECT_NAME)-test.conf $(DIST_DIRS) $(DIST_FILES))
-	$(OCSIGENSERVER) $(RUN_DEBUG) -c $<
-test.opt: $(addprefix $(TEST_PREFIX),$(ETCDIR)/$(PROJECT_NAME)-test.conf $(DIST_DIRS) $(patsubst %.cma,%.cmxs, $(DIST_FILES)))
-	$(OCSIGENSERVER.OPT) $(RUN_DEBUG) -c $<
-
-$(addprefix $(TEST_PREFIX), $(DIST_DIRS)):
-	mkdir -p $@
-
-##----------------------------------------------------------------------
-## Installing & Running
-
-.PHONY: install install.byte install.byte install.opt install.static install.etc install.lib install.lib.byte install.lib.opt run.byte run.opt
-install: install.byte install.opt
-install.byte: install.lib.byte install.etc install.static | $(addprefix $(PREFIX),$(DATADIR) $(LOGDIR) $(shell dirname $(CMDPIPE)))
-install.opt: install.lib.opt install.etc install.static | $(addprefix $(PREFIX),$(DATADIR) $(LOGDIR) $(shell dirname $(CMDPIPE)))
-install.lib: install.lib.byte install.lib.opt
-install.lib.byte: $(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cma | $(PREFIX)$(LIBDIR)
-	install $< $(PREFIX)$(LIBDIR)
-install.lib.opt: $(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cmxs | $(PREFIX)$(LIBDIR)
-	install $< $(PREFIX)$(LIBDIR)
-install.static: $(TEST_PREFIX)$(ELIOMSTATICDIR)/$(PROJECT_NAME).js | $(PREFIX)$(STATICDIR) $(PREFIX)$(ELIOMSTATICDIR)
-	cp -r $(LOCAL_STATIC)/* $(PREFIX)$(STATICDIR)
-	[ -z $(WWWUSER) ] || chown -R $(WWWUSER) $(PREFIX)$(STATICDIR)
-	install $(addprefix -o ,$(WWWUSER)) $< $(PREFIX)$(ELIOMSTATICDIR)
-install.etc: $(TEST_PREFIX)$(ETCDIR)/$(PROJECT_NAME).conf | $(PREFIX)$(ETCDIR)
-	install $< $(PREFIX)$(ETCDIR)/$(PROJECT_NAME).conf
-
-.PHONY:
-print-install-files:
-	@echo $(PREFIX)$(LIBDIR)
-	@echo $(PREFIX)$(STATICDIR)
-	@echo $(PREFIX)$(ELIOMSTATICDIR)
-	@echo $(PREFIX)$(ETCDIR)
-
-$(addprefix $(PREFIX),$(ETCDIR) $(LIBDIR)):
-	install -d $@
-$(addprefix $(PREFIX),$(DATADIR) $(LOGDIR) $(STATICDIR) $(ELIOMSTATICDIR) $(shell dirname $(CMDPIPE))):
-	install $(addprefix -o ,$(WWWUSER)) -d $@
-
-run.byte:
-	$(OCSIGENSERVER) $(RUN_DEBUG) -c ${PREFIX}${ETCDIR}/${PROJECT_NAME}.conf
-run.opt:
-	$(OCSIGENSERVER.OPT) $(RUN_DEBUG) -c ${PREFIX}${ETCDIR}/${PROJECT_NAME}.conf
-
-##----------------------------------------------------------------------
-## Aux
-
-# Use `eliomdep -sort' only in OCaml>4
-ifeq ($(shell ocamlc -version|cut -c1),4)
-eliomdep=$(shell $(ELIOMDEP) $(1) -ppx -sort $(2) $(filter %.eliom %.ml,$(3))))
-else
-eliomdep=$(3)
-endif
-objs=$(patsubst %.ml,$(1)/%.$(2),$(patsubst %.eliom,$(1)/%.$(2),$(filter %.eliom %.ml,$(3))))
-depsort=$(call objs,$(1),$(2),$(call eliomdep,$(3),$(4),$(5)))
-
-##----------------------------------------------------------------------
-## Config files
-
-FINDLIB_PACKAGES=$(patsubst %,\<extension\ findlib-package=\"%\"\ /\>,$(SERVER_PACKAGES))
-EDIT_WARNING=DON\'T EDIT THIS FILE! It is generated from $(PROJECT_NAME).conf.in, edit that one, or the variables in Makefile.options
-SED_ARGS := -e "/^ *%%%/d"
-SED_ARGS += -e "s|%%PROJECT_NAME%%|$(PROJECT_NAME)|g"
-SED_ARGS += -e "s|%%DATABASE_NAME%%|$(DATABASE_NAME)|g"
-SED_ARGS += -e "s|%%DATABASE_USER%%|$(DATABASE_USER)|g"
-SED_ARGS += -e "s|%%CMDPIPE%%|%%PREFIX%%$(CMDPIPE)|g"
-SED_ARGS += -e "s|%%LOGDIR%%|%%PREFIX%%$(LOGDIR)|g"
-SED_ARGS += -e "s|%%DATADIR%%|%%PREFIX%%$(DATADIR)|g"
-SED_ARGS += -e "s|%%PERSISTENT_DATA_BACKEND%%|$(PERSISTENT_DATA_BACKEND)|g"
-SED_ARGS += -e "s|%%LIBDIR%%|%%PREFIX%%$(LIBDIR)|g"
-SED_ARGS += -e "s|%%WARNING%%|$(EDIT_WARNING)|g"
-SED_ARGS += -e "s|%%PACKAGES%%|$(FINDLIB_PACKAGES)|g"
-SED_ARGS += -e "s|%%ELIOMSTATICDIR%%|%%PREFIX%%$(ELIOMSTATICDIR)|g"
-ifeq ($(DEBUG),yes)
-  SED_ARGS += -e "s|%%DEBUGMODE%%|\<debugmode /\>|g"
-else
-  SED_ARGS += -e "s|%%DEBUGMODE%%||g"
-endif
-
-LOCAL_SED_ARGS := -e "s|%%PORT%%|$(TEST_PORT)|g"
-LOCAL_SED_ARGS += -e "s|%%STATICDIR%%|$(LOCAL_STATIC)|g"
-LOCAL_SED_ARGS += -e "s|%%USERGROUP%%||g"
-GLOBAL_SED_ARGS := -e "s|%%PORT%%|$(PORT)|g"
-GLOBAL_SED_ARGS += -e "s|%%STATICDIR%%|%%PREFIX%%$(STATICDIR)|g"
-ifeq ($(WWWUSER)$(WWWGROUP),)
-  GLOBAL_SED_ARGS += -e "s|%%USERGROUP%%||g"
-else
-  GLOBAL_SED_ARGS += -e "s|%%USERGROUP%%|<user>$(WWWUSER)</user><group>$(WWWGROUP)</group>|g"
-endif
-
-$(TEST_PREFIX)${ETCDIR}/${PROJECT_NAME}.conf: ${PROJECT_NAME}.conf.in Makefile.options | $(TEST_PREFIX)$(ETCDIR)
-	sed $(SED_ARGS) $(GLOBAL_SED_ARGS) $< | sed -e "s|%%PREFIX%%|$(PREFIX)|g" > $@
-$(TEST_PREFIX)${ETCDIR}/${PROJECT_NAME}-test.conf: ${PROJECT_NAME}.conf.in Makefile.options | $(TEST_PREFIX)$(ETCDIR)
-	sed $(SED_ARGS) $(LOCAL_SED_ARGS) $< | sed -e "s|%%PREFIX%%|$(TEST_PREFIX)|g" > $@
-
-##----------------------------------------------------------------------
-## Server side compilation
-
-SERVER_INC  := ${addprefix -package ,${SERVER_PACKAGES}}
-
-${ELIOM_TYPE_DIR}/%.type_mli: %.eliom
-	${ELIOMC} -infer ${SERVER_INC} $<
-
-$(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cma: $(call objs,$(ELIOM_SERVER_DIR),cmo,$(SERVER_FILES)) | $(TEST_PREFIX)$(LIBDIR)
-	${ELIOMC} -a -o $@ $(GENERATE_DEBUG) \
-          $(call depsort,$(ELIOM_SERVER_DIR),cmo,-server,$(SERVER_INC),$(SERVER_FILES))
-
-$(TEST_PREFIX)$(LIBDIR)/$(PROJECT_NAME).cmxa: $(call objs,$(ELIOM_SERVER_DIR),cmx,$(SERVER_FILES)) | $(TEST_PREFIX)$(LIBDIR)
-	${ELIOMOPT} -a -o $@ $(GENERATE_DEBUG) \
-          $(call depsort,$(ELIOM_SERVER_DIR),cmx,-server,$(SERVER_INC),$(SERVER_FILES))
-
-%.cmxs: %.cmxa
-	$(ELIOMOPT) -shared -linkall -o $@ $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmi: %.mli
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmi: %.eliomi
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmo: %.ml
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-${ELIOM_SERVER_DIR}/%.cmo: %.eliom
-	${ELIOMC} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_SERVER_DIR}/%.cmx: %.ml
-	${ELIOMOPT} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-${ELIOM_SERVER_DIR}/%.cmx: %.eliom
-	${ELIOMOPT} -c ${SERVER_INC} $(GENERATE_DEBUG) $<
-
-
-##----------------------------------------------------------------------
-## Client side compilation
-
-CLIENT_LIBS := ${addprefix -package ,${CLIENT_PACKAGES}}
-CLIENT_INC  := ${addprefix -package ,${CLIENT_PACKAGES}}
-
-CLIENT_OBJS := $(filter %.eliom %.ml, $(CLIENT_FILES))
-CLIENT_OBJS := $(patsubst %.eliom,${ELIOM_CLIENT_DIR}/%.cmo, ${CLIENT_OBJS})
-CLIENT_OBJS := $(patsubst %.ml,${ELIOM_CLIENT_DIR}/%.cmo, ${CLIENT_OBJS})
-
-$(TEST_PREFIX)$(ELIOMSTATICDIR)/$(PROJECT_NAME).js: $(call objs,$(ELIOM_CLIENT_DIR),cmo,$(CLIENT_FILES)) | $(TEST_PREFIX)$(ELIOMSTATICDIR)
-	${JS_OF_ELIOM} -o $@ $(GENERATE_DEBUG) $(CLIENT_INC) $(DEBUG_JS) \
-          $(call depsort,$(ELIOM_CLIENT_DIR),cmo,-client,$(CLIENT_INC),$(CLIENT_FILES))
-
-${ELIOM_CLIENT_DIR}/%.cmi: %.mli
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_CLIENT_DIR}/%.cmo: %.eliom
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-${ELIOM_CLIENT_DIR}/%.cmo: %.ml
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-
-${ELIOM_CLIENT_DIR}/%.cmi: %.eliomi
-	${JS_OF_ELIOM} -c ${CLIENT_INC} $(GENERATE_DEBUG) $<
-
-##----------------------------------------------------------------------
-## Dependencies
-
-include .depend
-
-.depend: $(patsubst %,$(DEPSDIR)/%.server,$(SERVER_FILES)) $(patsubst %,$(DEPSDIR)/%.client,$(CLIENT_FILES))
-	cat $^ > $@
-
-$(DEPSDIR)/%.server: % | $(DEPSDIR)
-	$(ELIOMDEP) -server -ppx $(SERVER_INC) $< > $@
-
-$(DEPSDIR)/%.client: % | $(DEPSDIR)
-	$(ELIOMDEP) -client -ppx $(CLIENT_INC) $< > $@
-
-$(DEPSDIR):
-	mkdir $@
-
-##----------------------------------------------------------------------
-## Clean up
-
-clean:
-	-rm -f *.cm[ioax] *.cmxa *.cmxs *.o *.a *.annot
-	-rm -f *.type_mli
-	-rm -f ${PROJECT_NAME}.js
-	-rm -rf ${ELIOM_CLIENT_DIR} ${ELIOM_SERVER_DIR}
-
-distclean: clean
-	-rm -rf $(TEST_PREFIX) $(DEPSDIR) .depend
diff --git a/pkg/distillery/basic.ppx/Makefile.options b/pkg/distillery/basic.ppx/Makefile.options
deleted file mode 100644
index 791a4a6fe0..0000000000
--- a/pkg/distillery/basic.ppx/Makefile.options
+++ /dev/null
@@ -1,64 +0,0 @@
-
-#----------------------------------------------------------------------
-#           SETTINGS FOR THE ELIOM PROJECT %%%PROJECT_NAME%%%
-#----------------------------------------------------------------------
-
-PROJECT_NAME := %%%PROJECT_NAME%%%
-
-# Source files for the server
-SERVER_FILES := $(wildcard *.eliomi *.eliom)
-# Source files for the client
-CLIENT_FILES := $(wildcard *.eliomi *.eliom)
-
-# OCamlfind packages for the server
-SERVER_PACKAGES := lwt_ppx js_of_ocaml-ppx.deriving
-# OCamlfind packages for the client
-CLIENT_PACKAGES := lwt_ppx js_of_ocaml-ppx js_of_ocaml-ppx.deriving
-
-# Directory with files to be statically served
-LOCAL_STATIC = static
-
-# The backend for persistent data. Can be dbm or sqlite.
-# Make sure you have the following packages installed
-# - *dbm* if you use dbm --> opam install dbm.
-# - *sqlite3* if you use sqlite --> opam install sqlite3.
-PERSISTENT_DATA_BACKEND = %%%PROJECT_DB%%%
-
-# Debug application (yes/no): Debugging info in compilation,
-# JavaScript, ocsigenserver
-DEBUG := no
-
-# User to run server with (make run.*)
-WWWUSER := www-data
-WWWGROUP := www-data
-
-# Port for running the server (make run.*)
-PORT := 80
-
-# Port for testing (make test.*)
-TEST_PORT := 8080
-
-# Root of installation (must end with /)
-PREFIX := /usr/local/
-
-# Local folder for make test.* (must end with /)
-# Do not add files manually in this directory.
-# It is just here to test your installation before installing in /
-TEST_PREFIX := local/
-
-# The installation tree (relative to $(PREFIX) when
-# installing/running or $(TEST_PREFIX) when testing).
-# Configuration file $(PROJECT_NAME).conf
-ETCDIR := etc/${PROJECT_NAME}
-# Project's library $(PROJECT_NAME).cma (cmxs)
-LIBDIR := lib/${PROJECT_NAME}
-# Command pipe, eg. $ echo reload > $(INSTALL_PREFIX)$(CMDPIPE)
-CMDPIPE := var/run/${PROJECT_NAME}-cmd
-# Ocsigenserver's logging files
-LOGDIR := var/log/${PROJECT_NAME}
-# Ocsigenserver's persistent data files
-DATADIR := var/data/${PROJECT_NAME}
-# Copy of $(LOCAL_STATIC)
-STATICDIR := var/www/${PROJECT_NAME}/static
-# Project's JavaScript file
-ELIOMSTATICDIR := var/www/${PROJECT_NAME}/eliom
diff --git a/pkg/distillery/basic.ppx/PROJECT_NAME.conf.in b/pkg/distillery/basic.ppx/PROJECT_NAME.conf.in
deleted file mode 100644
index 13a8a1fdbb..0000000000
--- a/pkg/distillery/basic.ppx/PROJECT_NAME.conf.in
+++ /dev/null
@@ -1,28 +0,0 @@
-%%% This is the template for your configuration file. The %%VALUES%% below are
-%%% taken from the Makefile to generate the actual configuration files.
-%%% This comment will disappear.
-<!-- %%WARNING%% -->
-<ocsigen>
-  <server>
-    <port>%%PORT%%</port>
-    %%% Only set for running, not for testing
-    %%USERGROUP%%
-    <logdir>%%LOGDIR%%</logdir>
-    <datadir>%%DATADIR%%</datadir>
-    <charset>utf-8</charset>
-    %%% Only set when debugging
-    %%DEBUGMODE%%
-    <commandpipe>%%CMDPIPE%%</commandpipe>
-    <extension findlib-package="ocsigenserver.ext.staticmod"/>
-    <extension findlib-package="ocsigenserver.ext.ocsipersist-%%PERSISTENT_DATA_BACKEND%%"/>
-    <extension findlib-package="eliom.server"/>
-    %%% This will include the packages defined as SERVER_PACKAGES in your Makefile:
-    %%PACKAGES%%
-    <host hostfilter="*">
-      <static dir="%%STATICDIR%%" />
-      <static dir="%%ELIOMSTATICDIR%%" />
-      <eliommodule module="%%LIBDIR%%/%%PROJECT_NAME%%.cma" />
-      <eliom/>
-    </host>
-  </server>
-</ocsigen>
diff --git a/pkg/distillery/basic.ppx/PROJECT_NAME.eliom b/pkg/distillery/basic.ppx/PROJECT_NAME.eliom
deleted file mode 100644
index 77ec3706a7..0000000000
--- a/pkg/distillery/basic.ppx/PROJECT_NAME.eliom
+++ /dev/null
@@ -1,30 +0,0 @@
-[%%shared
-    open Eliom_lib
-    open Eliom_content
-    open Html.D
-]
-
-module %%%MODULE_NAME%%%_app =
-  Eliom_registration.App (
-    struct
-      let application_name = "%%%PROJECT_NAME%%%"
-      let global_data_path = None
-    end)
-
-let main_service =
-  Eliom_service.create
-    ~path:(Eliom_service.Path [])
-    ~meth:(Eliom_service.Get Eliom_parameter.unit)
-    ()
-
-let () =
-  %%%MODULE_NAME%%%_app.register
-    ~service:main_service
-    (fun () () ->
-      Lwt.return
-        (Eliom_tools.F.html
-           ~title:"%%%PROJECT_NAME%%%"
-           ~css:[["css";"%%%PROJECT_NAME%%%.css"]]
-           Html.F.(body [
-             h1 [pcdata "Welcome from Eliom's distillery!"];
-           ])))
diff --git a/pkg/distillery/basic.ppx/README b/pkg/distillery/basic.ppx/README
deleted file mode 100644
index 6c48aa8af2..0000000000
--- a/pkg/distillery/basic.ppx/README
+++ /dev/null
@@ -1,82 +0,0 @@
-
-Instructions
-============
-
-This project is (initially) generated by eliom-distillery as the basic
-project "%%%PROJECT_NAME%%%".
-
-Generally, you can compile it and run ocsigenserver on it by
-  $ make test.byte (or test.opt)
-See below for other useful targets for make.
-
-Generated files
----------------
-
-The following files in this directory have been generated by
-eliom-distillery:
-
- - %%%PROJECT_NAME%%%.eliom
-   This is your initial source file.
-%%%ifdef OCAML4%%%
-   All Eliom files (*.eliom, *.eliomi) in this directory are
-   automatically considered.  To add a .ml/.mli file to your project,
-   append it to the variable SERVER_FILES or CLIENT_FILES.
-%%%endif%%%
-%%%ifdef OCAML3%%%
-   To add more source files (.ml,.mli,.eliom,.eliomi) to your project,
-   add it to the variables SERVER_FILES and/or CLIENT_FILES.
-%%%endif%%%
-
- - static/
-   The content of this folder is statically served. Put your CSS or
-   additional JavaScript files here!
-
- - Makefile.options
-   Configure your project here!
-
- - %%%PROJECT_NAME%%%.conf.in
-   This file is a template for the configuration file for
-   ocsigenserver. You will rarely have to edit itself - it takes its
-   variables from the Makefile.options. This way, the installation
-   rules and the configuration files are synchronized with respect to
-   the different folders.
-
- - Makefile
-   This contains all rules necessary to build, test, and run your
-   Eliom application. You better don't touch it ;) See below for the
-   relevant targets.
-
- - local/
-   This directory is the target of the temporary installation of
-   your application, to test locally before doing a system-wide
-   installation in /. Do not put anything manually here.
-
- - README
-   Not completely describable here.
-
-
-Makefile targets
-----------------
-
-Here's some help on how to work with this basic distillery project:
-
- - Test your application by compiling it and running ocsigenserver locally
-     $ make test.byte (or test.opt)
-
- - Compile it only
-     $ make all (or byte or opt)
-
- - Deploy your project on your system
-     $ sudo make install (or install.byte or install.opt)
-
- - Run the server on the deployed project
-     $ sudo make run.byte (or run.opt)
-
-   If WWWUSER in the Makefile.options is you, you don't need the
-   `sudo'. If Eliom isn't installed globally, however, you need to
-   re-export some environment variables to make this work:
-     $ sudo PATH=$PATH OCAMLPATH=$OCAMLPATH LD_LIBRARY_PATH=$LD_LIBRARY_PATH make run.byte/run.opt
-
- - If you need a findlib package in your project, add it to the
-   variables SERVER_PACKAGES and/or CLIENT_PACKAGES. The configuration
-   file will be automatically updated.
diff --git a/pkg/distillery/basic.ppx/static!css!PROJECT_NAME.css b/pkg/distillery/basic.ppx/static!css!PROJECT_NAME.css
deleted file mode 100644
index b71fa50add..0000000000
--- a/pkg/distillery/basic.ppx/static!css!PROJECT_NAME.css
+++ /dev/null
@@ -1,3 +0,0 @@
-* {
-    font-family: sans-serif;
-}
diff --git a/pkg/etc/mime.types b/pkg/etc/mime.types
deleted file mode 100644
index 3485692d11..0000000000
--- a/pkg/etc/mime.types
+++ /dev/null
@@ -1,592 +0,0 @@
-# This is a comment. I love comments.
-
-# This file controls what Internet media types are sent to the client for
-# given file extension(s).  Sending the correct media type to the client
-# is important so they know how to handle the content of the file.
-# Extra types can either be added here or by using an AddType directive
-# in your config files. For more information about Internet media types,
-# please read RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type
-# registry is at <http://www.iana.org/assignments/media-types/>.
-
-# MIME type			Extensions
-application/activemessage
-application/andrew-inset	ez
-application/applefile
-application/atom+xml		atom
-application/atomicmail
-application/batch-smtp
-application/beep+xml
-application/cals-1840
-application/cnrp+xml
-application/commonground
-application/cpl+xml
-application/cybercash
-application/dca-rft
-application/dec-dx
-application/dvcs
-application/edi-consent
-application/edifact
-application/edi-x12
-application/eshop
-application/font-tdpfr
-application/http
-application/hyperstudio
-application/iges
-application/index
-application/index.cmd
-application/index.obj
-application/index.response
-application/index.vnd
-application/iotp
-application/ipp
-application/isup
-application/mac-binhex40	hqx
-application/mac-compactpro	cpt
-application/macwriteii
-application/marc
-application/mathematica
-application/mathml+xml		mathml
-application/msword		doc
-application/news-message-id
-application/news-transmission
-application/ocsp-request
-application/ocsp-response
-application/octet-stream	bin dms lha lzh exe class so dll dmg
-application/oda			oda
-application/ogg			ogg
-application/parityfec
-application/pdf			pdf
-application/pgp-encrypted
-application/pgp-keys
-application/pgp-signature
-application/pkcs10
-application/pkcs7-mime
-application/pkcs7-signature
-application/pkix-cert
-application/pkix-crl
-application/pkixcmp
-application/postscript		ai eps ps
-application/prs.alvestrand.titrax-sheet
-application/prs.cww
-application/prs.nprend
-application/prs.plucker
-application/qsig
-application/rdf+xml		rdf
-application/reginfo+xml
-application/remote-printing
-application/riscos
-application/rtf
-application/sdp
-application/set-payment
-application/set-payment-initiation
-application/set-registration
-application/set-registration-initiation
-application/sgml
-application/sgml-open-catalog
-application/sieve
-application/slate
-application/smil		smi smil
-application/srgs		gram
-application/srgs+xml		grxml
-application/timestamp-query
-application/timestamp-reply
-application/tve-trigger
-application/vemmi
-application/vnd.3gpp.pic-bw-large
-application/vnd.3gpp.pic-bw-small
-application/vnd.3gpp.pic-bw-var
-application/vnd.3gpp.sms
-application/vnd.3m.post-it-notes
-application/vnd.accpac.simply.aso
-application/vnd.accpac.simply.imp
-application/vnd.acucobol
-application/vnd.acucorp
-application/vnd.adobe.xfdf
-application/vnd.aether.imp
-application/vnd.amiga.ami
-application/vnd.anser-web-certificate-issue-initiation
-application/vnd.anser-web-funds-transfer-initiation
-application/vnd.audiograph
-application/vnd.blueice.multipass
-application/vnd.bmi
-application/vnd.businessobjects
-application/vnd.canon-cpdl
-application/vnd.canon-lips
-application/vnd.cinderella
-application/vnd.claymore
-application/vnd.commerce-battelle
-application/vnd.commonspace
-application/vnd.contact.cmsg
-application/vnd.cosmocaller
-application/vnd.criticaltools.wbs+xml
-application/vnd.ctc-posml
-application/vnd.cups-postscript
-application/vnd.cups-raster
-application/vnd.cups-raw
-application/vnd.curl
-application/vnd.cybank
-application/vnd.data-vision.rdz
-application/vnd.dna
-application/vnd.dpgraph
-application/vnd.dreamfactory
-application/vnd.dxr
-application/vnd.ecdis-update
-application/vnd.ecowin.chart
-application/vnd.ecowin.filerequest
-application/vnd.ecowin.fileupdate
-application/vnd.ecowin.series
-application/vnd.ecowin.seriesrequest
-application/vnd.ecowin.seriesupdate
-application/vnd.enliven
-application/vnd.epson.esf
-application/vnd.epson.msf
-application/vnd.epson.quickanime
-application/vnd.epson.salt
-application/vnd.epson.ssf
-application/vnd.ericsson.quickcall
-application/vnd.eudora.data
-application/vnd.fdf
-application/vnd.ffsns
-application/vnd.fints
-application/vnd.flographit
-application/vnd.framemaker
-application/vnd.fsc.weblaunch
-application/vnd.fujitsu.oasys
-application/vnd.fujitsu.oasys2
-application/vnd.fujitsu.oasys3
-application/vnd.fujitsu.oasysgp
-application/vnd.fujitsu.oasysprs
-application/vnd.fujixerox.ddd
-application/vnd.fujixerox.docuworks
-application/vnd.fujixerox.docuworks.binder
-application/vnd.fut-misnet
-application/vnd.grafeq
-application/vnd.groove-account
-application/vnd.groove-help
-application/vnd.groove-identity-message
-application/vnd.groove-injector
-application/vnd.groove-tool-message
-application/vnd.groove-tool-template
-application/vnd.groove-vcard
-application/vnd.hbci
-application/vnd.hhe.lesson-player
-application/vnd.hp-hpgl
-application/vnd.hp-hpid
-application/vnd.hp-hps
-application/vnd.hp-pcl
-application/vnd.hp-pclxl
-application/vnd.httphone
-application/vnd.hzn-3d-crossword
-application/vnd.ibm.afplinedata
-application/vnd.ibm.electronic-media
-application/vnd.ibm.minipay
-application/vnd.ibm.modcap
-application/vnd.ibm.rights-management
-application/vnd.ibm.secure-container
-application/vnd.informix-visionary
-application/vnd.intercon.formnet
-application/vnd.intertrust.digibox
-application/vnd.intertrust.nncp
-application/vnd.intu.qbo
-application/vnd.intu.qfx
-application/vnd.irepository.package+xml
-application/vnd.is-xpr
-application/vnd.japannet-directory-service
-application/vnd.japannet-jpnstore-wakeup
-application/vnd.japannet-payment-wakeup
-application/vnd.japannet-registration
-application/vnd.japannet-registration-wakeup
-application/vnd.japannet-setstore-wakeup
-application/vnd.japannet-verification
-application/vnd.japannet-verification-wakeup
-application/vnd.jisp
-application/vnd.kde.karbon
-application/vnd.kde.kchart
-application/vnd.kde.kformula
-application/vnd.kde.kivio
-application/vnd.kde.kontour
-application/vnd.kde.kpresenter
-application/vnd.kde.kspread
-application/vnd.kde.kword
-application/vnd.kenameaapp
-application/vnd.koan
-application/vnd.liberty-request+xml
-application/vnd.llamagraphics.life-balance.desktop
-application/vnd.llamagraphics.life-balance.exchange+xml
-application/vnd.lotus-1-2-3
-application/vnd.lotus-approach
-application/vnd.lotus-freelance
-application/vnd.lotus-notes
-application/vnd.lotus-organizer
-application/vnd.lotus-screencam
-application/vnd.lotus-wordpro
-application/vnd.mcd
-application/vnd.mediastation.cdkey
-application/vnd.meridian-slingshot
-application/vnd.micrografx.flo
-application/vnd.micrografx.igx
-application/vnd.mif		mif
-application/vnd.minisoft-hp3000-save
-application/vnd.mitsubishi.misty-guard.trustweb
-application/vnd.mobius.daf
-application/vnd.mobius.dis
-application/vnd.mobius.mbk
-application/vnd.mobius.mqy
-application/vnd.mobius.msl
-application/vnd.mobius.plc
-application/vnd.mobius.txf
-application/vnd.mophun.application
-application/vnd.mophun.certificate
-application/vnd.motorola.flexsuite
-application/vnd.motorola.flexsuite.adsi
-application/vnd.motorola.flexsuite.fis
-application/vnd.motorola.flexsuite.gotap
-application/vnd.motorola.flexsuite.kmr
-application/vnd.motorola.flexsuite.ttc
-application/vnd.motorola.flexsuite.wem
-application/vnd.mozilla.xul+xml	xul
-application/vnd.ms-artgalry
-application/vnd.ms-asf
-application/vnd.ms-excel	xls
-application/vnd.ms-lrm
-application/vnd.ms-powerpoint	ppt
-application/vnd.ms-project
-application/vnd.ms-tnef
-application/vnd.ms-works
-application/vnd.ms-wpl
-application/vnd.mseq
-application/vnd.msign
-application/vnd.music-niff
-application/vnd.musician
-application/vnd.netfpx
-application/vnd.noblenet-directory
-application/vnd.noblenet-sealer
-application/vnd.noblenet-web
-application/vnd.novadigm.edm
-application/vnd.novadigm.edx
-application/vnd.novadigm.ext
-application/vnd.obn
-application/vnd.osa.netdeploy
-application/vnd.palm
-application/vnd.pg.format
-application/vnd.pg.osasli
-application/vnd.powerbuilder6
-application/vnd.powerbuilder6-s
-application/vnd.powerbuilder7
-application/vnd.powerbuilder7-s
-application/vnd.powerbuilder75
-application/vnd.powerbuilder75-s
-application/vnd.previewsystems.box
-application/vnd.publishare-delta-tree
-application/vnd.pvi.ptid1
-application/vnd.pwg-multiplexed
-application/vnd.pwg-xhtml-print+xml
-application/vnd.quark.quarkxpress
-application/vnd.rapid
-application/vnd.s3sms
-application/vnd.sealed.net
-application/vnd.seemail
-application/vnd.shana.informed.formdata
-application/vnd.shana.informed.formtemplate
-application/vnd.shana.informed.interchange
-application/vnd.shana.informed.package
-application/vnd.smaf
-application/vnd.sss-cod
-application/vnd.sss-dtf
-application/vnd.sss-ntf
-application/vnd.street-stream
-application/vnd.svd
-application/vnd.swiftview-ics
-application/vnd.triscape.mxs
-application/vnd.trueapp
-application/vnd.truedoc
-application/vnd.ufdl
-application/vnd.uplanet.alert
-application/vnd.uplanet.alert-wbxml
-application/vnd.uplanet.bearer-choice
-application/vnd.uplanet.bearer-choice-wbxml
-application/vnd.uplanet.cacheop
-application/vnd.uplanet.cacheop-wbxml
-application/vnd.uplanet.channel
-application/vnd.uplanet.channel-wbxml
-application/vnd.uplanet.list
-application/vnd.uplanet.list-wbxml
-application/vnd.uplanet.listcmd
-application/vnd.uplanet.listcmd-wbxml
-application/vnd.uplanet.signal
-application/vnd.vcx
-application/vnd.vectorworks
-application/vnd.vidsoft.vidconference
-application/vnd.visio
-application/vnd.visionary
-application/vnd.vividence.scriptfile
-application/vnd.vsf
-application/vnd.wap.sic
-application/vnd.wap.slc
-application/vnd.wap.wbxml	wbxml
-application/vnd.wap.wmlc	wmlc
-application/vnd.wap.wmlscriptc	wmlsc
-application/vnd.webturbo
-application/vnd.wrq-hp3000-labelled
-application/vnd.wt.stf
-application/vnd.wv.csp+wbxml
-application/vnd.xara
-application/vnd.xfdl
-application/vnd.yamaha.hv-dic
-application/vnd.yamaha.hv-script
-application/vnd.yamaha.hv-voice
-application/vnd.yellowriver-custom-menu
-application/voicexml+xml	vxml
-application/watcherinfo+xml
-application/whoispp-query
-application/whoispp-response
-application/wita
-application/wordperfect5.1
-application/x-bcpio		bcpio
-application/x-cdlink		vcd
-application/x-chess-pgn		pgn
-application/x-compress
-application/x-cpio		cpio
-application/x-csh		csh
-application/x-director		dcr dir dxr
-application/x-dvi		dvi
-application/x-futuresplash	spl
-application/x-gtar		gtar
-application/x-gzip
-application/x-hdf		hdf
-application/x-javascript	js
-application/x-koan		skp skd skt skm
-application/x-latex		latex
-application/x-netcdf		nc cdf
-application/x-sh		sh
-application/x-shar		shar
-application/x-shockwave-flash	swf
-application/x-stuffit		sit
-application/x-sv4cpio		sv4cpio
-application/x-sv4crc		sv4crc
-application/x-tar		tar
-application/x-tcl		tcl
-application/x-tex		tex
-application/x-texinfo		texinfo texi
-application/x-troff		t tr roff
-application/x-troff-man		man
-application/x-troff-me		me
-application/x-troff-ms		ms
-application/x-ustar		ustar
-application/x-wais-source	src
-application/x400-bp
-application/xhtml+xml		xhtml xht
-application/xslt+xml		xslt
-application/xml			xml xsl
-application/xml-dtd		dtd
-application/xml-external-parsed-entity
-application/zip			zip
-audio/32kadpcm
-audio/amr
-audio/amr-wb
-audio/basic			au snd
-audio/cn
-audio/dat12
-audio/dsr-es201108
-audio/dvi4
-audio/evrc
-audio/evrc0
-audio/g722
-audio/g.722.1
-audio/g723
-audio/g726-16
-audio/g726-24
-audio/g726-32
-audio/g726-40
-audio/g728
-audio/g729
-audio/g729D
-audio/g729E
-audio/gsm
-audio/gsm-efr
-audio/l8
-audio/l16
-audio/l20
-audio/l24
-audio/lpc
-audio/midi			mid midi kar
-audio/mpa
-audio/mpa-robust
-audio/mp4a-latm
-audio/mpeg			mpga mp2 mp3
-audio/parityfec
-audio/pcma
-audio/pcmu
-audio/prs.sid
-audio/qcelp
-audio/red
-audio/smv
-audio/smv0
-audio/telephone-event
-audio/tone
-audio/vdvi
-audio/vnd.3gpp.iufp
-audio/vnd.cisco.nse
-audio/vnd.cns.anp1
-audio/vnd.cns.inf1
-audio/vnd.digital-winds
-audio/vnd.everad.plj
-audio/vnd.lucent.voice
-audio/vnd.nortel.vbk
-audio/vnd.nuera.ecelp4800
-audio/vnd.nuera.ecelp7470
-audio/vnd.nuera.ecelp9600
-audio/vnd.octel.sbc
-audio/vnd.qcelp
-audio/vnd.rhetorex.32kadpcm
-audio/vnd.vmx.cvsd
-audio/x-aiff			aif aiff aifc
-audio/x-alaw-basic
-audio/x-mpegurl			m3u
-audio/x-pn-realaudio		ram ra
-audio/x-pn-realaudio-plugin
-application/vnd.rn-realmedia	rm
-audio/x-wav			wav
-chemical/x-pdb			pdb
-chemical/x-xyz			xyz
-image/bmp			bmp
-image/cgm			cgm
-image/g3fax
-image/gif			gif
-image/ief			ief
-image/jpeg			jpeg jpg jpe
-image/naplps
-image/png			png
-image/prs.btif
-image/prs.pti
-image/svg+xml			svg
-image/t38
-image/tiff			tiff tif
-image/tiff-fx
-image/vnd.cns.inf2
-image/vnd.djvu			djvu djv
-image/vnd.dwg
-image/vnd.dxf
-image/vnd.fastbidsheet
-image/vnd.fpx
-image/vnd.fst
-image/vnd.fujixerox.edmics-mmr
-image/vnd.fujixerox.edmics-rlc
-image/vnd.globalgraphics.pgb
-image/vnd.mix
-image/vnd.ms-modi
-image/vnd.net-fpx
-image/vnd.svf
-image/vnd.wap.wbmp		wbmp
-image/vnd.xiff
-image/x-cmu-raster		ras
-image/x-icon			ico
-image/x-portable-anymap		pnm
-image/x-portable-bitmap		pbm
-image/x-portable-graymap	pgm
-image/x-portable-pixmap		ppm
-image/x-rgb			rgb
-image/x-xbitmap			xbm
-image/x-xpixmap			xpm
-image/x-xwindowdump		xwd
-message/delivery-status
-message/disposition-notification
-message/external-body
-message/http
-message/news
-message/partial
-message/rfc822
-message/s-http
-message/sip
-message/sipfrag
-model/iges			igs iges
-model/mesh			msh mesh silo
-model/vnd.dwf
-model/vnd.flatland.3dml
-model/vnd.gdl
-model/vnd.gs-gdl
-model/vnd.gtw
-model/vnd.mts
-model/vnd.parasolid.transmit.binary
-model/vnd.parasolid.transmit.text
-model/vnd.vtu
-model/vrml			wrl vrml
-multipart/alternative
-multipart/appledouble
-multipart/byteranges
-multipart/digest
-multipart/encrypted
-multipart/form-data
-multipart/header-set
-multipart/mixed
-multipart/parallel
-multipart/related
-multipart/report
-multipart/signed
-multipart/voice-message
-text/calendar			ics ifb
-text/css			css
-text/directory
-text/enriched
-text/html			html htm
-text/parityfec
-text/plain			asc txt
-text/prs.lines.tag
-text/rfc822-headers
-text/richtext			rtx
-text/rtf			rtf
-text/sgml			sgml sgm
-text/t140
-text/tab-separated-values	tsv
-text/uri-list
-text/vnd.abc
-text/vnd.curl
-text/vnd.dmclientscript
-text/vnd.fly
-text/vnd.fmi.flexstor
-text/vnd.in3d.3dml
-text/vnd.in3d.spot
-text/vnd.iptc.nitf
-text/vnd.iptc.newsml
-text/vnd.latex-z
-text/vnd.motorola.reflex
-text/vnd.ms-mediapackage
-text/vnd.net2phone.commcenter.command
-text/vnd.sun.j2me.app-descriptor
-text/vnd.wap.si
-text/vnd.wap.sl
-text/vnd.wap.wml		wml
-text/vnd.wap.wmlscript		wmls
-text/x-setext			etx
-text/xml
-text/xml-external-parsed-entity
-video/bmpeg
-video/bt656
-video/celb
-video/dv
-video/h261
-video/h263
-video/h263-1998
-video/h263-2000
-video/jpeg
-video/mp1s
-video/mp2p
-video/mp2t
-video/mp4v-es
-video/mpv
-video/mpeg			mpeg mpg mpe
-video/nv
-video/parityfec
-video/pointer
-video/quicktime			qt mov
-video/smpte292m
-video/vnd.fvt
-video/vnd.motorola.video
-video/vnd.motorola.videop
-video/vnd.mpegurl		mxu m4u
-video/vnd.nokia.interleaved-multimedia
-video/vnd.objectvideo
-video/vnd.vivo
-video/x-msvideo			avi
-video/x-sgi-movie		movie
-x-conference/x-cooltalk		ice
diff --git a/pkg/filelist.ml b/pkg/filelist.ml
deleted file mode 100644
index 9023b484f1..0000000000
--- a/pkg/filelist.ml
+++ /dev/null
@@ -1,212 +0,0 @@
-type descr = {
-  interface_only : string list;
-  interface : string list;
-  internal : string list;
-}
-
-let server = {
-  interface_only = [
-    "eliom_content_sigs";
-    "eliom_form_sigs";
-    "eliom_parameter_sigs";
-    "eliom_registration_sigs";
-    "eliom_service_sigs";
-    "eliom_shared_sigs";
-  ];
-  interface = [
-    "eliom_bus";
-    "eliom_client_value";
-    "eliom_syntax";
-    "eliom_client";
-    "eliom_comet";
-    "eliom_common";
-    "eliom_config";
-    "eliom_content";
-    "eliom_cookie";
-    "eliom_extension";
-    "eliom_lib";
-    "eliom_mkreg";
-    "eliom_notif";
-    "eliom_parameter";
-    "eliom_react";
-    "eliom_shared";
-    "eliom_cscache";
-    "eliom_reference";
-    "eliom_registration";
-    "eliom_request_info";
-    "eliom_service";
-    "eliom_state";
-    "eliom_tools";
-    "eliom_types";
-    "eliom_uri";
-    "eliom_wrap";
-  ];
-  internal = [
-    "eliom_comet_base";
-    "eliom_common_base";
-    "eliom_runtime";
-    "eliom_content_";
-    "eliom_content_core";
-    "eliom_cookies_base";
-    "eliom_error_pages";
-    "eliom_form";
-    "eliom_lazy";
-    "eliom_lib_base";
-    "eliom_parameter_base";
-    "eliom_process";
-    "eliom_service_base";
-    "eliom_route";
-    "eliom_route_base";
-    "eliom_shared_content";
-    "eliom_types_base";
-    "eliommod";
-    "eliommod_cli";
-    "eliommod_cookies";
-    "eliommod_datasess";
-    "eliommod_gc";
-    "eliommod_pagegen";
-    "eliommod_parameters";
-    "eliommod_persess";
-    "eliommod_sersess";
-    "eliommod_sessadmin";
-    "eliommod_sessexpl";
-    "eliommod_sessiongroups";
-    "eliommod_timeouts";
-  ]
-}
-let client = {
-  interface_only = [
-    "eliom_content_sigs";
-    "eliom_form_sigs";
-    "eliom_parameter_sigs";
-    "eliom_registration_sigs";
-    "eliom_service_sigs";
-    "eliom_shared_sigs";
-  ];
-  interface = [
-    "eliom_bus";
-    "eliom_client_value";
-    "eliom_client_core";
-    "eliom_client";
-    "eliom_comet";
-    "eliom_config";
-    "eliom_content";
-    "eliom_content_core";
-    "eliom_lazy";
-    "eliom_lib";
-    "eliom_parameter";
-    "eliom_react";
-    "eliom_shared";
-    "eliom_cscache";
-    "eliom_registration";
-    "eliom_service";
-    "eliom_tools";
-    "eliom_types";
-    "eliom_unwrap";
-    "eliom_uri";
-  ];
-  internal = [
-    "eliom_comet_base";
-    "eliom_common";
-    "eliom_common_base";
-    "eliom_runtime";
-    "eliom_content_";
-    "eliom_cookies_base";
-    "eliom_form";
-    "eliom_lib_base";
-    "eliom_parameter_base";
-    "eliom_process";
-    "eliom_request";
-    "eliom_request_info";
-    "eliom_service_base";
-    "eliom_route";
-    "eliom_route_base";
-    "eliom_shared_content";
-    "eliom_types_base";
-    "eliommod_cookies";
-    "eliommod_dom";
-    "eliommod_parameters";
-  ];
-}
-
-let server_ext = {
-  interface_only = [];
-  interface = [
-    "atom_feed";
-    "eliom_atom";
-    "eliom_openid";
-    "eliom_s2s"];
-  internal = []
-}
-
-let ocamlbuild = {
-  interface_only = [];
-  interface = [ "ocamlbuild_eliom" ];
-  internal = []
-
-}
-
-let ppx = {
-  interface_only = [];
-  interface = [ "ppx_eliom" ; "ppx_eliom_client" ; "ppx_eliom_type" ; "ppx_eliom_server" ];
-  internal = [ "ppx_eliom_utils" ];
-}
-
-
-let (-.-) name ext = name ^ "." ^ ext
-let exts el sl =
-  List.flatten (
-    List.map (fun ext ->
-        List.map (fun name ->
-            name -.- ext) sl) el)
-
-let list_to_file filename list =
-  let oc = open_out filename in
-  List.iter (fun s ->
-      output_string oc s;
-      output_char oc '\n';
-    ) list;
-  close_out oc;;
-
-let client_mllib =
-  client.interface @ client.internal
-
-let client_extra =
-  exts ["cmi"] (client.interface_only @ client.interface)
-
-let client_api =
-  client.interface_only @ client.interface
-
-let server_mllib =
-  server.interface @ server.internal
-
-let server_extra =
-  exts ["cmi"] (server.interface_only @ server.interface) @
-  exts ["cmx"] (server.interface @ server.internal)
-
-let server_api =
-  server.interface_only @ server.interface
-
-let server_ext_mllib = server_ext.interface @ server_ext.internal
-let server_ext_extra =
-  exts ["cmi"] (server_ext.interface_only @ server_ext.interface) @
-  exts ["cmx"] (server_ext.interface @ server_ext.internal)
-
-let ocamlbuild_mllib = ocamlbuild.interface @ ocamlbuild.internal
-let ocamlbuild_extra =
-  exts ["cmi"] (ocamlbuild.interface_only @ ocamlbuild.interface) @
-  exts ["cmx"] (ocamlbuild.interface @ ocamlbuild.internal)
-let ocamlbuild_api = ocamlbuild.interface_only @ ocamlbuild.interface
-
-let ppx_mllib = ppx.interface @ ppx.internal
-let ppx_extra =
-  exts ["cmi"] ppx.interface @
-  exts ["cmx"] (ppx.interface @ ppx.internal)
-let ppx_api = ppx.interface
-
-
-let templates_dir = "pkg/distillery"
-let templates = Array.to_list (Sys.readdir templates_dir)
-let templates_files =
-  List.map (fun name ->
-    name, Array.to_list (Sys.readdir (templates_dir^"/"^name))) templates
diff --git a/pkg/man/eliom-distillery.1 b/pkg/man/eliom-distillery.1
deleted file mode 100644
index 8a542e1b3c..0000000000
--- a/pkg/man/eliom-distillery.1
+++ /dev/null
@@ -1,51 +0,0 @@
-.TH eliom-distillery 1 2012-12-17
-.SH NAME
-eliom-distillery \- Scaffolding for your Eliom-projects.
-.SH SYNOPSIS
-.B eliom-distillery
-.BI \-dir
-
-.B eliom-distillery
-.BI \-name \ name
-[
-.BI \-template \ <template>
-] [
-.BI \-target-directory \ <dir>
-]
-.SH DESCRIPTION
-This program generates the scaffold for your Eliom application
-from a template. Currently, it only supports a very simple
-template named "basic", but later versions will include more
-comprehensive templates!
-.P
-Please refer to the generated README for more information on how to
-work with the project.
-.P
-The manual on the web contains more information:
-http://ocsigen.org/eliom/manual/workflow-distillery.
-.SH OPTIONS
-.TP 5
-.BI \-dir
-Display the directory where templates are installed.
-.TP
-.BI \-name \ name
-The name of project to be generated. Note well, that this must be a
-valid name for a compilation unit.
-.TP
-.BI \-template \ template
-The template for the project. Currently,
-.I basic
-is the only available template.
-.TP
-.BI \-target-directory \ dir
-Generated the project in directory <dir>.
-.I name
-is used by default.
-.B eliom-distillery
-will create it if it doesn't already exist.
-.SH SEE ALSO
-.BR eliomc (1).
-.SH AUTHOR
-.B eliom-distillery
-is part of the Ocsigen-project, and written by
-Benedikt Becker.
diff --git a/pkg/man/eliomc.1 b/pkg/man/eliomc.1
deleted file mode 100644
index 3b2b6aa89a..0000000000
--- a/pkg/man/eliomc.1
+++ /dev/null
@@ -1,212 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.TH ELIOMC 1 2012-02-15
-.SH NAME
-eliomc, eliomcp, eliomopt, js_of_eliom, eliomdep \- the eliom build tools
-.SH SYNOPSIS
-.B eliomc
-.RI [ options ]
-.RI files
-
-.B eliomcp
-.RI [ options ]
-.RI files
-
-.B eliomopt
-.RI [ options ]
-.RI files
-
-.B eliomdep
-.RI [ options ]
-.RI files
-
-.B eliomdoc
-.RI [ options ]
-.RI files
-
-.B eliompp
-.RI [ -client | -server ]
-.RI files
-
-.B js_of_eliom
-.RI [ options ]
-.RI files
-\-o
-.RI filename.js
-.SH DESCRIPTION
-.B eliomc,
-.B eliomcp
-and
-.B eliomopt
-are wrapper around the OCaml compiler that ease the compilation of the
-server part of projects based on the Eliom framework. They
-respectively accept the same set of option than the
-.BR ocamlc (1), ocamlcp (1)
-and
-.BR ocamlopt (1)
-compilers plus the specific ones described in the
-.I OPTIONS
-section.
-
-.B js_of_eliom
-is a wrapper around the OCaml and Js_of_ocaml compilers that ease the
-compilation of the client part of projects based on the Eliom
-framework. It accepts the same set of option than the
-.BR ocamlc (1)
-compiler plus the specific ones described in the
-.I OPTIONS
-section.
-
-.B eliomdep
-is a wrapper around
-.BR ocamldep (1)
-that handles dependencies of an .eliom source files. It accepts the
-same set of options plus the specific ones described in the
-.I OPTIONS
-section. It makes the assumption that server-side compiled modules
-of OCaml files located in this directory subtree are in directory
-.I _server
-(with same subdirectories structure) (resp. in directory
-.I _client
-for client-side compiled modules).
-
-.B eliompp (EXPERIMENTAL)
-is a preprocessor which remove specific sections, depending on the given option.
-The option
-.BR -client
-will remove all the top-level parts and server sections
-and the option
-.BR -server
-will remove only the client sections.
-
-.B eliomdoc (EXPERIMENTAL)
-is a wrapper around the OCaml documentation generator
-.B ocamldoc.
-It allows you to generate documentation from
-.B client
-or
-.B server
-side. It accepts the same set of option than
-.BR ocamldoc (1).
-It automatically extracts the commentaries from the desired sections.
-.B eliomdoc
-is currently experimental, and you could find some undefined behaviours.
-(see http://ocsigen.org/eliom/manual/workflow-compilation). Some well
-known bugs are:
-.br
-.IP \[bu]
-your files should always begin with a value and not with a comment. Otherwise,
-camlp4 won't output the commentaries.
-.br
-.IP \[bu]
-sometimes, comment node are not attached as expected. That's because
-camlp4 (sometimes) remove extra new line between value elements.
-
-.SH COMPILING ELIOM SOURCE FILES
-
-The compilation of files with a .eliom extension is achieved in three
-steps: infer the type of value sent by the server to the client;
-compile the server part of the code and compile the client part. The
-first two steps can be realised with
-.B eliomc
-and the last one with
-.B js_of_eliom.
-
-Both tools produce a .cmo file named as the original .eliom file. To
-avoid overwriting the .cmo representing the server part with .cmo of
-the client part, files generated by
-.BR eliomc \ or \ eliomopt
-are stored by default in a subdirectory named _server and files generated by
-.B js_of_eliom
-are stored in a subdirectory named _client. Those default directories
-could be respectively overridden by the environment variables
-ELIOM_SERVER_DIR and ELIOM_CLIENT_DIR.
-
-The types inferred by
-.B eliomc
-for values sent by the server to the client are stored in an
-intermediate files named as the original .eliom file and whose
-extension is .type_mli. That file is required by
-.B js_of_eliom
-for compiling the client part of the .eliom file. The
-.B eliomdep
-tool correctly generate dependencies that intermediate file for the
-server .cmo and the client .cmo.
-
-.SH OPTIONS
-.BR \-eliom-inc\ <dir>
-Add <dir> to the list of eliom include directories (eliomdep only).
-.TP
-.TP
-.BR \-dir\ <dir>
-Specify the target directory for generated files
-.TP
-.BR \-package\ <name>
-This is the same option as the ocamlfind one.
-.TP
-.BR \-predicates\ <p>
-This is the same option as the ocamlfind one.
-.TP
-.BR \-no-autoload
-Do not load commonly used syntax extensions
-(deriving, lwt, js_of_ocaml, tyxml).
-.TP
-.BR \-type-conv
-Use type_conv syntax extensions instead of deriving one. It has no effect
-if used in conjunction with \-no-autoload.
-.TP
-.BR \-ppopt\ <opt>
-Append <opt> to preprocessor invocation.
-.TP
-.BR \-jsopt\ <opt>
-Append <opt> to js_of_ocaml invocation (js_of_eliom only).
-.TP
-.BR \-infer\ <opt>
-For .eliom file, only generate the intermediate .type_mli file (eliomc and eliomopt only).
-.TP
-.BR \-noinfer\ <opt>
-For .eliom file, do not generate the intermediate .type_mli file (eliomc and eliomopt only).
-.TP
-.BR \-help \ or \ \-\-help
-Display a short usage summary and exit.
-.SH EXAMPLES
-The compilation of an Eliom projects composed of a server specific file named server.ml, a client specific file named client.ml and two common files name base.eliom and main.eliom, could be achieved with the following commands:
-
-\ \ \ \ eliomc \-a \-o appl.cma server.ml base.eliom main.eliom
-.br
-\ \ \ \ js_of_eliom \-o appl.js client.ml base.eliom main.eliom
-
-To avoid recompiling the whole project each times, this could be split in multiple steps:
-
-\ \ \ \ eliomc \-c server.ml
-.br
-\ \ \ \ eliomc \-c base.eliom
-.br
-\ \ \ \ eliomc \-c main.eliom
-.br
-\ \ \ \ eliomc \-a \-o appl.cma _server/server.cmo _server/base.cmo _server/main.cmo
-.br
-\ \ \ \ js_of_eliom \-c client.ml
-.br
-\ \ \ \ js_of_eliom \-c base.eliom
-.br
-\ \ \ \ js_of_eliom \-c main.eliom
-.br
-\ \ \ \ js_of_eliom \-o appl.js _client/client.cmo _client/base.cmo _client/main.cmo
-
-
-
-.SH SEE ALSO
-.BR ocamlc (1),
-.BR ocamlopt (1),
-.BR js_of_ocaml (1),
-.BR ocamlfind (1),
-.BR ocamlcp (1),
-.BR ocamldep (1).
-.SH AUTHOR
-eliomc, js_of_eliom, eliomdep and eliomopt were written by
-Gregoire Henry <gregoire.henry@pps.jussieu.fr>.
-
-eliomdoc was written by
-Charly Chevalier <charly.n.chevalier@gmail.com>.
-.PP
-This manual page was written by Pierre Chambart <chambart@crans.org>.
diff --git a/pkg/topkg.ml b/pkg/topkg.ml
deleted file mode 100644
index c2c9c0dc7d..0000000000
--- a/pkg/topkg.ml
+++ /dev/null
@@ -1,358 +0,0 @@
-(*---------------------------------------------------------------------------
-   Copyright (c) 2014 Daniel C. Bünzli. All rights reserved.
-   Distributed under the BSD3 license, see license at the end of the file.
-   %%NAME%% release %%VERSION%%
-  ---------------------------------------------------------------------------*)
-
-(* Public api *)
-
-(** Build environment access *)
-module type Env = sig
-  val bool : string -> bool
-  (** [bool key] declares [key] as being a boolean key in the environment.
-      Specifing key=(true|false) on the command line becomes mandatory. *)
-
-  val native : bool
-  (** [native] is [bool "native"]. *)
-
-  val native_dynlink : bool
-  (** [native_dylink] is [bool "native-dynlink"] *)
-end
-
-(** Exts defines sets of file extensions. *)
-module type Exts = sig
-  val interface : string list
-  (** [interface] is [[".mli"; ".cmi"; ".cmti"]] *)
-
-  val interface_opt : string list
-  (** [interface_opt] is [".cmx" :: interface] *)
-
-  val library : string list
-  (** [library] is [[".cma"; ".cmxa"; ".cmxs"; ".a"]] *)
-
-  val module_library : string list
-  (** [module_library] is [(interface_opt @ library)]. *)
-end
-
-(** Package description. *)
-module type Pkg = sig
-  type builder = [ `OCamlbuild | `Other of string * string ]
-  (** The type for build tools. Either [`OCamlbuild] or an
-      [`Other (tool, bdir)] tool [tool] that generates its build artefacts
-      in [bdir]. *)
-
-  type moves
-  (** The type for install moves. *)
-
-  type field = ?cond:bool -> ?exts:string list -> ?dst:string -> ?target:string -> string -> moves
-  (** The type for field install functions. A call
-      [field cond exts dst path] generates install moves as follows:
-      {ul
-      {- If [cond] is [false] (defaults to [true]), no move is generated.}
-      {- If [exts] is present, generates a move for each path in
-         the list [List.map (fun e -> path ^ e) exts].}
-      {- If [dst] is present this path is used as the move destination
-         (allows to install in subdirectories). If absent [dst] is
-         [Filename.basename path].} *)
-
-  val lib : field
-  val bin : ?auto:bool -> field
-  (** If [auto] is true (defaults to false) generates
-      [path ^ ".native"] if {!Env.native} is [true] and
-      [path ^ ".byte"] if {!Env.native} is [false]. *)
-
-  val sbin : ?auto:bool -> field (** See {!bin}. *)
-  val toplevel : field
-  val share : field
-  val share_root : field
-  val etc : field
-  val doc : field
-  val misc : field
-  val stublibs : field
-  val man : field
-  val describe : string -> builder:builder -> moves list -> unit
-  (** [describe name builder moves] describes a package named [name] with
-      builder [builder] and install moves [moves]. *)
-end
-
-(* Implementation *)
-
-module Topkg : sig
-  val cmd : [`Build | `Explain | `Help ]
-  val env : (string * bool) list
-  val err_parse : string -> 'a
-  val err_mdef : string -> 'a
-  val err_miss : string -> 'a
-  val err_file : string -> string -> 'a
-  val warn_unused : string -> unit
-end = struct
-
-  (* Parses the command line. The actual cmd execution occurs in the call
-     to Pkg.describe. *)
-
-  let err fmt =
-    let k _ = exit 1 in
-    Format.kfprintf k Format.err_formatter ("%s: " ^^ fmt ^^ "@.") Sys.argv.(0)
-
-  let err_parse a = err "argument `%s' is not of the form key=(true|false)" a
-  let err_mdef a = err "bool `%s' is defined more than once" a
-  let err_miss a = err "argument `%s=(true|false)' is missing" a
-  let err_file f e = err "%s: %s" f e
-  let warn_unused k =
-    Format.eprintf "%s: warning: environment key `%s` unused.@." Sys.argv.(0) k
-
-  let cmd, env =
-    let rec parse_env acc = function                            (* not t.r. *)
-    | arg :: args ->
-        begin try
-          (* String.cut ... *)
-          let len = String.length arg in
-          let eq = String.index arg '=' in
-          let bool = bool_of_string (String.sub arg (eq + 1) (len - eq - 1)) in
-          let key = String.sub arg 0 eq in
-          if key = "" then raise Exit else
-          try ignore (List.assoc key acc); err_mdef key with
-          | Not_found -> parse_env ((key, bool) :: acc) args
-        with
-        | Invalid_argument _ | Not_found | Exit -> err_parse arg
-        end
-    | [] -> acc
-    in
-    match List.tl (Array.to_list Sys.argv) with
-    | "explain" :: args -> `Explain, parse_env [] args
-    | ("help" | "-h" | "--help" | "-help") :: args -> `Help, parse_env [] args
-    | args -> `Build, parse_env [] args
-end
-
-module Env : sig
-  include Env
-  val get : unit -> (string * bool) list
-end = struct
-  let env = ref []
-  let get () = !env
-  let add_bool key b = env := (key, b) :: !env
-  let bool key =
-    let b = try List.assoc key Topkg.env with
-    | Not_found -> if Topkg.cmd = `Build then Topkg.err_miss key else true
-    in
-    add_bool key b; b
-
-  let native = bool "native"
-  let native_dynlink = bool "native-dynlink"
-end
-
-module Exts : Exts = struct
-  let interface = [".mli"; ".cmi"; ".cmti"]
-  let interface_opt = ".cmx" :: interface
-  let library = [".cma"; ".cmxa"; ".cmxs"; ".a"]
-  let module_library = (interface_opt @ library)
-end
-
-module Pkg : Pkg = struct
-  type builder = [ `OCamlbuild | `Other of string * string ]
-  type move = {
-    field_name : string;
-    target : string option;
-    source : string;
-    dest : string }
-  type moves = move list
-  type field = ?cond:bool -> ?exts:string list -> ?dst:string -> ?target:string -> string -> moves
-
-  let str = Printf.sprintf
-  let warn_unused () =
-    let keys = List.map fst Topkg.env in
-    let keys_used = List.map fst (Env.get ()) in
-    let unused = List.find_all (fun k -> not (List.mem k keys_used)) keys in
-    List.iter Topkg.warn_unused unused
-
-  let has_suffix = Filename.check_suffix
-
-  let build_command ?(exec_sep = " ") btool mvs =
-    let no_build = [ ".cmti"; ".cmt"] in
-    let exec = Buffer.create 1871 in
-    let add_target = function {field_name=field; source=src; dest=dst;target} ->
-      let target = match target with
-        | None -> src
-        | Some s -> s in
-      if not (List.exists (has_suffix target) no_build) then
-        Buffer.add_string exec (str "%s%s" exec_sep target)
-    in
-    Buffer.add_string exec btool;
-    List.iter add_target mvs;
-    Buffer.contents exec
-
-  let split_char sep p =
-    let len = String.length p in
-    let rec split beg cur =
-      if cur >= len then
-        if cur - beg > 0
-        then [String.sub p beg (cur - beg)]
-        else []
-      else if p.[cur] = sep then
-        String.sub p beg (cur - beg) :: split (cur + 1) (cur + 1)
-      else
-        split beg (cur + 1) in
-    split 0 0
-
-  let holes src dst =
-    let aux x = match split_char '%' x with
-      | [x;y] -> Some (x,y)
-      | _ -> None in
-    match aux src, aux dst with
-    | Some (s_path,s_suffix),Some(d_path,d_suffix) -> Some (s_path,s_suffix,d_path,d_suffix)
-    | None,None -> None
-    | Some (s_path,s_suffix),None -> Some (s_path,s_suffix,dst,s_suffix)
-    | _ -> assert false
-
-  let list_files bdir src dst =
-    match holes src dst with
-    | None -> [str "%s/%s" bdir src, dst]
-    | Some (s_path,s_suffix,d_path,d_suffix) ->
-      let p = bdir ^ "/" ^ s_path in
-      let l = Array.to_list (Sys.readdir p) in
-      let l = List.filter (fun f -> has_suffix f s_suffix) l in
-      List.map (fun s -> str "%s/%s%s" bdir s_path s,
-                         str "%s%s%s" d_path (Filename.chop_suffix s s_suffix) d_suffix) l
-
-  let build_install bdir mvs =
-    let no_build = [ ".cmti"; ".cmt"] in
-    let install = Buffer.create 1871 in
-    let rec add_mvs current = function
-      | {field_name=field; source=src; dest=dst;target} :: mvs when field = current ->
-        let target = match target with
-          | None -> src
-          | Some s -> s in
-        let option = if List.exists (has_suffix target) no_build then "?" else "" in
-        List.iter (fun (src,dst) ->
-          Buffer.add_string install (str "\n  \"%s%s\" {\"%s\"}" option src dst)
-        ) (list_files bdir src dst);
-        add_mvs current mvs
-      | {field_name=field}::_ as mvs ->
-        if current <> "" (* first *) then Buffer.add_string install " ]\n";
-        Buffer.add_string install (str "%s: [" field);
-        add_mvs field mvs
-      | [] -> ()
-    in
-    add_mvs "" mvs;
-    Buffer.add_string install " ]\n";
-    Buffer.contents install
-
-  let pr = Format.printf
-  let pr_explanation btool bdir pkg mvs  =
-    let env = Env.get () in
-    let exec = build_command ~exec_sep:" \\\n  " btool mvs in
-    let install = build_install bdir mvs in
-    pr "@[<v>";
-    pr "Package name: %s@," pkg;
-    pr "Build tool: %s@," btool;
-    pr "Build directory: %s@," bdir;
-    pr "Environment:@, ";
-    List.iter (fun (k,v) -> pr "%s=%b@, " k v) (List.sort compare env);
-    pr "@,Build invocation:@,";
-    pr " %s@,@," exec;
-    pr "Install file:@,";
-    pr "%s@," install;
-    pr "@]";
-    ()
-
-  let pr_help () =
-    pr "Usage example:@\n %s" Sys.argv.(0);
-    List.iter (fun (k,v) -> pr " %s=%b" k v) (List.sort compare (Env.get ()));
-    pr "@."
-
-  let build btool bdir pkg mvs =
-    let exec = build_command btool mvs in
-    let e = Sys.command exec in
-    if e <> 0 then exit e else
-    let install = build_install bdir mvs in
-    let install_file = pkg ^ ".install" in
-    try
-      let oc = open_out install_file in
-      output_string oc install; flush oc; close_out oc
-    with Sys_error e -> Topkg.err_file install_file e
-
-  let mvs ?(drop_exts = []) field ?(cond = true) ?(exts = []) ?dst ?target src =
-    if not cond then [] else
-    let mv src dst = {field_name=field; source=src; dest=dst; target} in
-    let expand exts s d = List.map (fun e -> mv (s ^ e) (d ^ e)) exts in
-    let dst = match dst with None -> Filename.basename src | Some dst -> dst in
-    let files = if exts = [] then [mv src dst] else expand exts src dst in
-    let keep {source=src} = not (List.exists (has_suffix src) drop_exts) in
-    List.find_all keep files
-
-  let lib =
-    let drop_exts =
-      if Env.native && not Env.native_dynlink then [ ".cmxs" ] else
-      if not Env.native then [ ".a"; ".cmx"; ".cmxa"; ".cmxs" ] else []
-    in
-    mvs ~drop_exts "lib"
-
-  let share = mvs "share"
-  let share_root = mvs "share_root"
-  let etc = mvs "etc"
-  let toplevel = mvs "toplevel"
-  let doc = mvs "doc"
-  let misc = mvs "misc"
-  let stublibs = mvs "stublibs"
-  let man = mvs "man"
-
-  let bin_drops = if not Env.native then [ ".native" ] else []
-  let bin_mvs field ?(auto = false) ?cond ?exts ?dst ?target src =
-    let src, dst =
-      if not auto then src, dst else
-      let dst = match dst with
-      | None -> Some (Filename.basename src)
-      | Some _ as dst -> dst
-      in
-      let src = if Env.native then src ^ ".native" else src ^ ".byte" in
-      src, dst
-    in
-    mvs ~drop_exts:bin_drops field ?cond ?dst ?exts ?target src
-
-  let bin = bin_mvs "bin"
-  let sbin = bin_mvs "sbin"
-
-  let describe pkg ~builder mvs =
-    let mvs = List.sort compare (List.flatten mvs) in
-    let btool, bdir = match builder with
-    | `OCamlbuild -> "ocamlbuild -use-ocamlfind -classic-display", "_build"
-    | `Other (btool, bdir) -> btool, bdir
-    in
-    match Topkg.cmd with
-    | `Explain -> pr_explanation btool bdir pkg mvs
-    | `Help -> pr_help ()
-    | `Build -> warn_unused (); build btool bdir pkg mvs
-end
-
-(*---------------------------------------------------------------------------
-   Copyright (c) 2014 Daniel C. Bünzli.
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-   3. Neither the name of Daniel C. Bünzli nor the names of
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ---------------------------------------------------------------------------*)
diff --git a/src/lib/client/common/dune b/src/lib/client/common/dune
new file mode 100644
index 0000000000..5b319ff68b
--- /dev/null
+++ b/src/lib/client/common/dune
@@ -0,0 +1,14 @@
+(library
+  (name internalclient)
+  (wrapped false)
+  (public_name eliom.client.common)
+  (libraries
+    eliom.common
+    js_of_ocaml.tyxml
+    js_of_ocaml-lwt.logger
+    react
+    reactiveData)
+  (preprocess
+    (pps
+      js_of_ocaml-ppx
+      js_of_ocaml-ppx_deriving_json)))
diff --git a/src/lib/eliom_client_value.client.ml b/src/lib/client/common/eliom_client_value.ml
similarity index 100%
rename from src/lib/eliom_client_value.client.ml
rename to src/lib/client/common/eliom_client_value.ml
diff --git a/src/lib/eliom_client_value.client.mli b/src/lib/client/common/eliom_client_value.mli
similarity index 100%
rename from src/lib/eliom_client_value.client.mli
rename to src/lib/client/common/eliom_client_value.mli
diff --git a/src/lib/client/common/eliom_common_base.ml b/src/lib/client/common/eliom_common_base.ml
new file mode 120000
index 0000000000..9e7b831fcc
--- /dev/null
+++ b/src/lib/client/common/eliom_common_base.ml
@@ -0,0 +1 @@
+../../shared/eliom_common_base.ml
\ No newline at end of file
diff --git a/src/lib/eliom_config.client.ml b/src/lib/client/common/eliom_config.ml
similarity index 100%
rename from src/lib/eliom_config.client.ml
rename to src/lib/client/common/eliom_config.ml
diff --git a/src/lib/eliom_config.client.mli b/src/lib/client/common/eliom_config.mli
similarity index 100%
rename from src/lib/eliom_config.client.mli
rename to src/lib/client/common/eliom_config.mli
diff --git a/src/lib/eliom_content_core.client.ml b/src/lib/client/common/eliom_content_core.ml
similarity index 100%
rename from src/lib/eliom_content_core.client.ml
rename to src/lib/client/common/eliom_content_core.ml
diff --git a/src/lib/eliom_content_core.client.mli b/src/lib/client/common/eliom_content_core.mli
similarity index 100%
rename from src/lib/eliom_content_core.client.mli
rename to src/lib/client/common/eliom_content_core.mli
diff --git a/src/lib/eliom_lazy.client.ml b/src/lib/client/common/eliom_lazy.ml
similarity index 100%
rename from src/lib/eliom_lazy.client.ml
rename to src/lib/client/common/eliom_lazy.ml
diff --git a/src/lib/eliom_lazy.client.mli b/src/lib/client/common/eliom_lazy.mli
similarity index 100%
rename from src/lib/eliom_lazy.client.mli
rename to src/lib/client/common/eliom_lazy.mli
diff --git a/src/lib/eliom_lib.client.ml b/src/lib/client/common/eliom_lib.ml
similarity index 100%
rename from src/lib/eliom_lib.client.ml
rename to src/lib/client/common/eliom_lib.ml
diff --git a/src/lib/eliom_lib.client.mli b/src/lib/client/common/eliom_lib.mli
similarity index 100%
rename from src/lib/eliom_lib.client.mli
rename to src/lib/client/common/eliom_lib.mli
diff --git a/src/lib/client/common/eliom_runtime.ml b/src/lib/client/common/eliom_runtime.ml
new file mode 120000
index 0000000000..6d80d46c3a
--- /dev/null
+++ b/src/lib/client/common/eliom_runtime.ml
@@ -0,0 +1 @@
+../../shared/eliom_runtime.ml
\ No newline at end of file
diff --git a/src/lib/client/common/eliom_runtime.mli b/src/lib/client/common/eliom_runtime.mli
new file mode 120000
index 0000000000..8f3cee3f4d
--- /dev/null
+++ b/src/lib/client/common/eliom_runtime.mli
@@ -0,0 +1 @@
+../../shared/eliom_runtime.mli
\ No newline at end of file
diff --git a/src/lib/eliom_unwrap.client.ml b/src/lib/client/common/eliom_unwrap.ml
similarity index 100%
rename from src/lib/eliom_unwrap.client.ml
rename to src/lib/client/common/eliom_unwrap.ml
diff --git a/src/lib/eliom_unwrap.client.mli b/src/lib/client/common/eliom_unwrap.mli
similarity index 100%
rename from src/lib/eliom_unwrap.client.mli
rename to src/lib/client/common/eliom_unwrap.mli
diff --git a/src/lib/client/dune b/src/lib/client/dune
new file mode 100644
index 0000000000..d7dadd3e3a
--- /dev/null
+++ b/src/lib/client/dune
@@ -0,0 +1,98 @@
+(library
+  (name client)
+  (public_name eliom.client)
+  (wrapped false)
+  (libraries
+    eliom.common
+    eliom.client.common
+    lwt
+    js_of_ocaml-lwt
+    lwt_react)
+  (preprocess
+    (pps
+      js_of_ocaml-ppx
+      js_of_ocaml-ppx_deriving_json
+      lwt_ppx))
+  (modules_without_implementation
+    eliom_content_sigs
+    eliom_form_sigs
+    eliom_parameter_sigs
+    eliom_registration_sigs
+    eliom_service_sigs
+    eliom_shared_sigs))
+
+(rule
+  (targets eliom_content.ml)
+  (deps ../eliom/eliom_content.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --impl %{deps}))))
+
+(rule
+  (targets eliom_cscache.ml)
+  (deps ../eliom/eliom_cscache.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --impl %{deps}))))
+
+(rule
+  (targets eliom_cscache.mli)
+  (deps ../eliom/eliom_cscache.eliomi)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --intf %{deps}))))
+
+(rule
+  (targets eliom_form.ml)
+  (deps ../eliom/eliom_form.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --impl %{deps}))))
+
+(rule
+  (targets eliom_form.mli)
+  (deps ../eliom/eliom_form.eliomi)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --intf %{deps}))))
+
+(rule
+  (targets eliom_service_base.ml)
+  (deps ../eliom/eliom_service_base.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --impl %{deps}))))
+
+(rule
+  (targets eliom_shared.ml)
+  (deps ../eliom/eliom_shared.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --impl %{deps}))))
+
+(rule
+  (targets eliom_shared_content.ml)
+  (deps ../eliom/eliom_shared_content.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --impl %{deps}))))
+
+(rule
+  (targets eliom_tools.ml)
+  (deps ../eliom/eliom_tools.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.client --impl %{deps}))))
+
+(install
+  (section lib)
+  (files (eliom_client.js as client/eliom_client.js)))
diff --git a/src/lib/eliom_bus.client.ml b/src/lib/client/eliom_bus.ml
similarity index 100%
rename from src/lib/eliom_bus.client.ml
rename to src/lib/client/eliom_bus.ml
diff --git a/src/lib/eliom_bus.client.mli b/src/lib/client/eliom_bus.mli
similarity index 100%
rename from src/lib/eliom_bus.client.mli
rename to src/lib/client/eliom_bus.mli
diff --git a/src/lib/eliom_client.client.ml b/src/lib/client/eliom_client.ml
similarity index 100%
rename from src/lib/eliom_client.client.ml
rename to src/lib/client/eliom_client.ml
diff --git a/src/lib/eliom_client.client.mli b/src/lib/client/eliom_client.mli
similarity index 100%
rename from src/lib/eliom_client.client.mli
rename to src/lib/client/eliom_client.mli
diff --git a/src/lib/client/eliom_client_base.ml b/src/lib/client/eliom_client_base.ml
new file mode 120000
index 0000000000..facae97b2f
--- /dev/null
+++ b/src/lib/client/eliom_client_base.ml
@@ -0,0 +1 @@
+../shared/eliom_client_base.ml
\ No newline at end of file
diff --git a/src/lib/eliom_client_core.client.ml b/src/lib/client/eliom_client_core.ml
similarity index 100%
rename from src/lib/eliom_client_core.client.ml
rename to src/lib/client/eliom_client_core.ml
diff --git a/src/lib/eliom_comet.client.ml b/src/lib/client/eliom_comet.ml
similarity index 100%
rename from src/lib/eliom_comet.client.ml
rename to src/lib/client/eliom_comet.ml
diff --git a/src/lib/eliom_comet.client.mli b/src/lib/client/eliom_comet.mli
similarity index 100%
rename from src/lib/eliom_comet.client.mli
rename to src/lib/client/eliom_comet.mli
diff --git a/src/lib/client/eliom_comet_base.ml b/src/lib/client/eliom_comet_base.ml
new file mode 120000
index 0000000000..0fae8e0136
--- /dev/null
+++ b/src/lib/client/eliom_comet_base.ml
@@ -0,0 +1 @@
+../shared/eliom_comet_base.ml
\ No newline at end of file
diff --git a/src/lib/client/eliom_comet_base.mli b/src/lib/client/eliom_comet_base.mli
new file mode 120000
index 0000000000..7c7653ca52
--- /dev/null
+++ b/src/lib/client/eliom_comet_base.mli
@@ -0,0 +1 @@
+../shared/eliom_comet_base.mli
\ No newline at end of file
diff --git a/src/lib/eliom_common.client.ml b/src/lib/client/eliom_common.ml
similarity index 100%
rename from src/lib/eliom_common.client.ml
rename to src/lib/client/eliom_common.ml
diff --git a/src/lib/eliom_content.client.mli b/src/lib/client/eliom_content.mli
similarity index 100%
rename from src/lib/eliom_content.client.mli
rename to src/lib/client/eliom_content.mli
diff --git a/src/lib/eliom_content_.client.ml b/src/lib/client/eliom_content_.ml
similarity index 100%
rename from src/lib/eliom_content_.client.ml
rename to src/lib/client/eliom_content_.ml
diff --git a/src/lib/client/eliom_content_sigs.mli b/src/lib/client/eliom_content_sigs.mli
new file mode 120000
index 0000000000..2296d13813
--- /dev/null
+++ b/src/lib/client/eliom_content_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_content_sigs.mli
\ No newline at end of file
diff --git a/src/lib/client/eliom_cookies_base.ml b/src/lib/client/eliom_cookies_base.ml
new file mode 120000
index 0000000000..f8f958fb69
--- /dev/null
+++ b/src/lib/client/eliom_cookies_base.ml
@@ -0,0 +1 @@
+../shared/eliom_cookies_base.ml
\ No newline at end of file
diff --git a/src/lib/client/eliom_form_sigs.mli b/src/lib/client/eliom_form_sigs.mli
new file mode 120000
index 0000000000..ff33d4f763
--- /dev/null
+++ b/src/lib/client/eliom_form_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_form_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_parameter.client.ml b/src/lib/client/eliom_parameter.ml
similarity index 100%
rename from src/lib/eliom_parameter.client.ml
rename to src/lib/client/eliom_parameter.ml
diff --git a/src/lib/eliom_parameter.client.mli b/src/lib/client/eliom_parameter.mli
similarity index 100%
rename from src/lib/eliom_parameter.client.mli
rename to src/lib/client/eliom_parameter.mli
diff --git a/src/lib/client/eliom_parameter_base.ml b/src/lib/client/eliom_parameter_base.ml
new file mode 120000
index 0000000000..e58afb653c
--- /dev/null
+++ b/src/lib/client/eliom_parameter_base.ml
@@ -0,0 +1 @@
+../shared/eliom_parameter_base.ml
\ No newline at end of file
diff --git a/src/lib/client/eliom_parameter_sigs.mli b/src/lib/client/eliom_parameter_sigs.mli
new file mode 120000
index 0000000000..4208352c3b
--- /dev/null
+++ b/src/lib/client/eliom_parameter_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_parameter_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_process.client.ml b/src/lib/client/eliom_process.ml
similarity index 100%
rename from src/lib/eliom_process.client.ml
rename to src/lib/client/eliom_process.ml
diff --git a/src/lib/eliom_react.client.ml b/src/lib/client/eliom_react.ml
similarity index 100%
rename from src/lib/eliom_react.client.ml
rename to src/lib/client/eliom_react.ml
diff --git a/src/lib/eliom_react.client.mli b/src/lib/client/eliom_react.mli
similarity index 100%
rename from src/lib/eliom_react.client.mli
rename to src/lib/client/eliom_react.mli
diff --git a/src/lib/eliom_registration.client.ml b/src/lib/client/eliom_registration.ml
similarity index 100%
rename from src/lib/eliom_registration.client.ml
rename to src/lib/client/eliom_registration.ml
diff --git a/src/lib/eliom_registration.client.mli b/src/lib/client/eliom_registration.mli
similarity index 100%
rename from src/lib/eliom_registration.client.mli
rename to src/lib/client/eliom_registration.mli
diff --git a/src/lib/client/eliom_registration_sigs.mli b/src/lib/client/eliom_registration_sigs.mli
new file mode 120000
index 0000000000..ab28cbf30e
--- /dev/null
+++ b/src/lib/client/eliom_registration_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_registration_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_request.client.ml b/src/lib/client/eliom_request.ml
similarity index 100%
rename from src/lib/eliom_request.client.ml
rename to src/lib/client/eliom_request.ml
diff --git a/src/lib/eliom_request.client.mli b/src/lib/client/eliom_request.mli
similarity index 100%
rename from src/lib/eliom_request.client.mli
rename to src/lib/client/eliom_request.mli
diff --git a/src/lib/eliom_request_info.client.ml b/src/lib/client/eliom_request_info.ml
similarity index 100%
rename from src/lib/eliom_request_info.client.ml
rename to src/lib/client/eliom_request_info.ml
diff --git a/src/lib/eliom_route.client.ml b/src/lib/client/eliom_route.ml
similarity index 100%
rename from src/lib/eliom_route.client.ml
rename to src/lib/client/eliom_route.ml
diff --git a/src/lib/client/eliom_route_base.ml b/src/lib/client/eliom_route_base.ml
new file mode 120000
index 0000000000..e94824dbcd
--- /dev/null
+++ b/src/lib/client/eliom_route_base.ml
@@ -0,0 +1 @@
+../shared/eliom_route_base.ml
\ No newline at end of file
diff --git a/src/lib/eliom_service.client.ml b/src/lib/client/eliom_service.ml
similarity index 100%
rename from src/lib/eliom_service.client.ml
rename to src/lib/client/eliom_service.ml
diff --git a/src/lib/eliom_service.client.mli b/src/lib/client/eliom_service.mli
similarity index 100%
rename from src/lib/eliom_service.client.mli
rename to src/lib/client/eliom_service.mli
diff --git a/src/lib/client/eliom_service_sigs.mli b/src/lib/client/eliom_service_sigs.mli
new file mode 120000
index 0000000000..e92688d810
--- /dev/null
+++ b/src/lib/client/eliom_service_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_service_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_shared.client.mli b/src/lib/client/eliom_shared.mli
similarity index 100%
rename from src/lib/eliom_shared.client.mli
rename to src/lib/client/eliom_shared.mli
diff --git a/src/lib/client/eliom_shared_sigs.mli b/src/lib/client/eliom_shared_sigs.mli
new file mode 120000
index 0000000000..e073cdca27
--- /dev/null
+++ b/src/lib/client/eliom_shared_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_shared_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_types.client.ml b/src/lib/client/eliom_types.ml
similarity index 100%
rename from src/lib/eliom_types.client.ml
rename to src/lib/client/eliom_types.ml
diff --git a/src/lib/client/eliom_types_base.ml b/src/lib/client/eliom_types_base.ml
new file mode 120000
index 0000000000..5fa16e6096
--- /dev/null
+++ b/src/lib/client/eliom_types_base.ml
@@ -0,0 +1 @@
+../shared/eliom_types_base.ml
\ No newline at end of file
diff --git a/src/lib/client/eliom_types_base.mli b/src/lib/client/eliom_types_base.mli
new file mode 120000
index 0000000000..3ad05bdc91
--- /dev/null
+++ b/src/lib/client/eliom_types_base.mli
@@ -0,0 +1 @@
+../shared/eliom_types_base.mli
\ No newline at end of file
diff --git a/src/lib/client/eliom_uri.ml b/src/lib/client/eliom_uri.ml
new file mode 120000
index 0000000000..5e190bb44f
--- /dev/null
+++ b/src/lib/client/eliom_uri.ml
@@ -0,0 +1 @@
+../shared/eliom_uri.ml
\ No newline at end of file
diff --git a/src/lib/client/eliom_uri.mli b/src/lib/client/eliom_uri.mli
new file mode 120000
index 0000000000..59abb18a68
--- /dev/null
+++ b/src/lib/client/eliom_uri.mli
@@ -0,0 +1 @@
+../shared/eliom_uri.mli
\ No newline at end of file
diff --git a/src/lib/common/dune b/src/lib/common/dune
new file mode 100644
index 0000000000..f2106e263f
--- /dev/null
+++ b/src/lib/common/dune
@@ -0,0 +1,5 @@
+(library
+  (name common)
+  (public_name eliom.common)
+  (libraries lwt_log ocsigenserver)
+  (wrapped false))
\ No newline at end of file
diff --git a/src/lib/common/eliom_lib_base.ml b/src/lib/common/eliom_lib_base.ml
new file mode 120000
index 0000000000..e2cd37b961
--- /dev/null
+++ b/src/lib/common/eliom_lib_base.ml
@@ -0,0 +1 @@
+../shared/eliom_lib_base.ml
\ No newline at end of file
diff --git a/src/lib/common/eliom_lib_base.mli b/src/lib/common/eliom_lib_base.mli
new file mode 120000
index 0000000000..508f7352b6
--- /dev/null
+++ b/src/lib/common/eliom_lib_base.mli
@@ -0,0 +1 @@
+../shared/eliom_lib_base.mli
\ No newline at end of file
diff --git a/src/lib/eliom_wrap.server.ml b/src/lib/common/eliom_wrap.ml
similarity index 100%
rename from src/lib/eliom_wrap.server.ml
rename to src/lib/common/eliom_wrap.ml
diff --git a/src/lib/eliom_wrap.server.mli b/src/lib/common/eliom_wrap.mli
similarity index 100%
rename from src/lib/eliom_wrap.server.mli
rename to src/lib/common/eliom_wrap.mli
diff --git a/src/lib/eliom_client_main.eliom b/src/lib/eliom/eliom_client_main.eliom
similarity index 100%
rename from src/lib/eliom_client_main.eliom
rename to src/lib/eliom/eliom_client_main.eliom
diff --git a/src/lib/eliom_content.eliom b/src/lib/eliom/eliom_content.eliom
similarity index 100%
rename from src/lib/eliom_content.eliom
rename to src/lib/eliom/eliom_content.eliom
diff --git a/src/lib/eliom_cscache.eliom b/src/lib/eliom/eliom_cscache.eliom
similarity index 100%
rename from src/lib/eliom_cscache.eliom
rename to src/lib/eliom/eliom_cscache.eliom
diff --git a/src/lib/eliom_cscache.eliomi b/src/lib/eliom/eliom_cscache.eliomi
similarity index 100%
rename from src/lib/eliom_cscache.eliomi
rename to src/lib/eliom/eliom_cscache.eliomi
diff --git a/src/lib/eliom_form.eliom b/src/lib/eliom/eliom_form.eliom
similarity index 100%
rename from src/lib/eliom_form.eliom
rename to src/lib/eliom/eliom_form.eliom
diff --git a/src/lib/eliom_form.eliomi b/src/lib/eliom/eliom_form.eliomi
similarity index 100%
rename from src/lib/eliom_form.eliomi
rename to src/lib/eliom/eliom_form.eliomi
diff --git a/src/lib/eliom_service_base.eliom b/src/lib/eliom/eliom_service_base.eliom
similarity index 100%
rename from src/lib/eliom_service_base.eliom
rename to src/lib/eliom/eliom_service_base.eliom
diff --git a/src/lib/eliom_shared.eliom b/src/lib/eliom/eliom_shared.eliom
similarity index 100%
rename from src/lib/eliom_shared.eliom
rename to src/lib/eliom/eliom_shared.eliom
diff --git a/src/lib/eliom_shared_content.eliom b/src/lib/eliom/eliom_shared_content.eliom
similarity index 100%
rename from src/lib/eliom_shared_content.eliom
rename to src/lib/eliom/eliom_shared_content.eliom
diff --git a/src/lib/eliom_shared_content.eliomi b/src/lib/eliom/eliom_shared_content.eliomi
similarity index 100%
rename from src/lib/eliom_shared_content.eliomi
rename to src/lib/eliom/eliom_shared_content.eliomi
diff --git a/src/lib/eliom_tools.eliom b/src/lib/eliom/eliom_tools.eliom
similarity index 100%
rename from src/lib/eliom_tools.eliom
rename to src/lib/eliom/eliom_tools.eliom
diff --git a/src/lib/eliom_tools.eliomi b/src/lib/eliom/eliom_tools.eliomi
similarity index 100%
rename from src/lib/eliom_tools.eliomi
rename to src/lib/eliom/eliom_tools.eliomi
diff --git a/src/lib/eliom_wrap.client.mli b/src/lib/eliom_wrap.client.mli
deleted file mode 100644
index 61e19572c7..0000000000
--- a/src/lib/eliom_wrap.client.mli
+++ /dev/null
@@ -1,7 +0,0 @@
-
-type poly
-type 'a wrapped_value = poly * 'a
-
-(**/**)
-
-type unwrapper
diff --git a/src/lib/server/common/dune b/src/lib/server/common/dune
new file mode 100644
index 0000000000..cdf5474dd4
--- /dev/null
+++ b/src/lib/server/common/dune
@@ -0,0 +1,11 @@
+(library
+  (name internalserver)
+  (wrapped false)
+  (public_name eliom.server.common)
+  (libraries
+    eliom.common
+    js_of_ocaml
+    ocsigenserver.ext
+    react)
+  (preprocess
+    (pps js_of_ocaml-ppx_deriving_json lwt_ppx)))
diff --git a/src/lib/eliom_client_value.server.ml b/src/lib/server/common/eliom_client_value.ml
similarity index 100%
rename from src/lib/eliom_client_value.server.ml
rename to src/lib/server/common/eliom_client_value.ml
diff --git a/src/lib/eliom_client_value.server.mli b/src/lib/server/common/eliom_client_value.mli
similarity index 100%
rename from src/lib/eliom_client_value.server.mli
rename to src/lib/server/common/eliom_client_value.mli
diff --git a/src/lib/eliom_common.server.ml b/src/lib/server/common/eliom_common.ml
similarity index 100%
rename from src/lib/eliom_common.server.ml
rename to src/lib/server/common/eliom_common.ml
diff --git a/src/lib/eliom_common.server.mli b/src/lib/server/common/eliom_common.mli
similarity index 100%
rename from src/lib/eliom_common.server.mli
rename to src/lib/server/common/eliom_common.mli
diff --git a/src/lib/server/common/eliom_common_base.ml b/src/lib/server/common/eliom_common_base.ml
new file mode 120000
index 0000000000..9e7b831fcc
--- /dev/null
+++ b/src/lib/server/common/eliom_common_base.ml
@@ -0,0 +1 @@
+../../shared/eliom_common_base.ml
\ No newline at end of file
diff --git a/src/lib/eliom_lazy.server.ml b/src/lib/server/common/eliom_lazy.ml
similarity index 100%
rename from src/lib/eliom_lazy.server.ml
rename to src/lib/server/common/eliom_lazy.ml
diff --git a/src/lib/eliom_lazy.server.mli b/src/lib/server/common/eliom_lazy.mli
similarity index 100%
rename from src/lib/eliom_lazy.server.mli
rename to src/lib/server/common/eliom_lazy.mli
diff --git a/src/lib/eliom_lib.server.ml b/src/lib/server/common/eliom_lib.ml
similarity index 100%
rename from src/lib/eliom_lib.server.ml
rename to src/lib/server/common/eliom_lib.ml
diff --git a/src/lib/eliom_lib.server.mli b/src/lib/server/common/eliom_lib.mli
similarity index 100%
rename from src/lib/eliom_lib.server.mli
rename to src/lib/server/common/eliom_lib.mli
diff --git a/src/lib/eliom_request_info.server.ml b/src/lib/server/common/eliom_request_info.ml
similarity index 100%
rename from src/lib/eliom_request_info.server.ml
rename to src/lib/server/common/eliom_request_info.ml
diff --git a/src/lib/eliom_request_info.server.mli b/src/lib/server/common/eliom_request_info.mli
similarity index 100%
rename from src/lib/eliom_request_info.server.mli
rename to src/lib/server/common/eliom_request_info.mli
diff --git a/src/lib/server/common/eliom_runtime.ml b/src/lib/server/common/eliom_runtime.ml
new file mode 120000
index 0000000000..6d80d46c3a
--- /dev/null
+++ b/src/lib/server/common/eliom_runtime.ml
@@ -0,0 +1 @@
+../../shared/eliom_runtime.ml
\ No newline at end of file
diff --git a/src/lib/server/common/eliom_runtime.mli b/src/lib/server/common/eliom_runtime.mli
new file mode 120000
index 0000000000..8f3cee3f4d
--- /dev/null
+++ b/src/lib/server/common/eliom_runtime.mli
@@ -0,0 +1 @@
+../../shared/eliom_runtime.mli
\ No newline at end of file
diff --git a/src/lib/server/dune b/src/lib/server/dune
new file mode 100644
index 0000000000..0156828043
--- /dev/null
+++ b/src/lib/server/dune
@@ -0,0 +1,92 @@
+(library
+  (name server)
+  (public_name eliom.server)
+  (wrapped false)
+  (libraries
+    eliom.common
+    eliom.server.common
+    lwt_react)
+  (preprocess
+    (pps
+      lwt_ppx
+      js_of_ocaml-ppx
+      js_of_ocaml-ppx_deriving_json))
+  (modules_without_implementation
+    eliom_content_sigs
+    eliom_form_sigs
+    eliom_parameter_sigs
+    eliom_registration_sigs
+    eliom_service_sigs
+    eliom_shared_sigs))
+
+(rule
+  (targets eliom_content.ml)
+  (deps ../eliom/eliom_content.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --impl %{deps}))))
+
+(rule
+  (targets eliom_cscache.ml)
+  (deps ../eliom/eliom_cscache.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --impl %{deps}))))
+
+(rule
+  (targets eliom_cscache.mli)
+  (deps ../eliom/eliom_cscache.eliomi)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --intf %{deps}))))
+
+(rule
+  (targets eliom_form.ml)
+  (deps ../eliom/eliom_form.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --impl %{deps}))))
+
+(rule
+  (targets eliom_form.mli)
+  (deps ../eliom/eliom_form.eliomi)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --intf %{deps}))))
+
+(rule
+  (targets eliom_service_base.ml)
+  (deps ../eliom/eliom_service_base.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --impl %{deps}))))
+
+(rule
+  (targets eliom_shared.ml)
+  (deps ../eliom/eliom_shared.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --impl %{deps}))))
+
+(rule
+  (targets eliom_shared_content.ml)
+  (deps ../eliom/eliom_shared_content.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --impl %{deps}))))
+
+(rule
+  (targets eliom_tools.ml)
+  (deps ../eliom/eliom_tools.eliom)
+  (action
+    (with-stdout-to
+      %{targets}
+      (run %{bin:ppxfind} -legacy ppx_eliom.ppx.server --impl %{deps}))))
diff --git a/src/lib/eliom_bus.server.ml b/src/lib/server/eliom_bus.ml
similarity index 100%
rename from src/lib/eliom_bus.server.ml
rename to src/lib/server/eliom_bus.ml
diff --git a/src/lib/eliom_bus.server.mli b/src/lib/server/eliom_bus.mli
similarity index 100%
rename from src/lib/eliom_bus.server.mli
rename to src/lib/server/eliom_bus.mli
diff --git a/src/lib/eliom_client.server.ml b/src/lib/server/eliom_client.ml
similarity index 100%
rename from src/lib/eliom_client.server.ml
rename to src/lib/server/eliom_client.ml
diff --git a/src/lib/eliom_client.server.mli b/src/lib/server/eliom_client.mli
similarity index 100%
rename from src/lib/eliom_client.server.mli
rename to src/lib/server/eliom_client.mli
diff --git a/src/lib/server/eliom_client_base.ml b/src/lib/server/eliom_client_base.ml
new file mode 120000
index 0000000000..facae97b2f
--- /dev/null
+++ b/src/lib/server/eliom_client_base.ml
@@ -0,0 +1 @@
+../shared/eliom_client_base.ml
\ No newline at end of file
diff --git a/src/lib/eliom_comet.server.ml b/src/lib/server/eliom_comet.ml
similarity index 100%
rename from src/lib/eliom_comet.server.ml
rename to src/lib/server/eliom_comet.ml
diff --git a/src/lib/eliom_comet.server.mli b/src/lib/server/eliom_comet.mli
similarity index 100%
rename from src/lib/eliom_comet.server.mli
rename to src/lib/server/eliom_comet.mli
diff --git a/src/lib/server/eliom_comet_base.ml b/src/lib/server/eliom_comet_base.ml
new file mode 120000
index 0000000000..0fae8e0136
--- /dev/null
+++ b/src/lib/server/eliom_comet_base.ml
@@ -0,0 +1 @@
+../shared/eliom_comet_base.ml
\ No newline at end of file
diff --git a/src/lib/server/eliom_comet_base.mli b/src/lib/server/eliom_comet_base.mli
new file mode 120000
index 0000000000..7c7653ca52
--- /dev/null
+++ b/src/lib/server/eliom_comet_base.mli
@@ -0,0 +1 @@
+../shared/eliom_comet_base.mli
\ No newline at end of file
diff --git a/src/lib/eliom_config.server.ml b/src/lib/server/eliom_config.ml
similarity index 100%
rename from src/lib/eliom_config.server.ml
rename to src/lib/server/eliom_config.ml
diff --git a/src/lib/eliom_config.server.mli b/src/lib/server/eliom_config.mli
similarity index 100%
rename from src/lib/eliom_config.server.mli
rename to src/lib/server/eliom_config.mli
diff --git a/src/lib/eliom_content.server.mli b/src/lib/server/eliom_content.mli
similarity index 100%
rename from src/lib/eliom_content.server.mli
rename to src/lib/server/eliom_content.mli
diff --git a/src/lib/eliom_content_.server.ml b/src/lib/server/eliom_content_.ml
similarity index 100%
rename from src/lib/eliom_content_.server.ml
rename to src/lib/server/eliom_content_.ml
diff --git a/src/lib/eliom_content_core.server.ml b/src/lib/server/eliom_content_core.ml
similarity index 100%
rename from src/lib/eliom_content_core.server.ml
rename to src/lib/server/eliom_content_core.ml
diff --git a/src/lib/eliom_content_core.server.mli b/src/lib/server/eliom_content_core.mli
similarity index 100%
rename from src/lib/eliom_content_core.server.mli
rename to src/lib/server/eliom_content_core.mli
diff --git a/src/lib/server/eliom_content_sigs.mli b/src/lib/server/eliom_content_sigs.mli
new file mode 120000
index 0000000000..2296d13813
--- /dev/null
+++ b/src/lib/server/eliom_content_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_content_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_cookie.server.ml b/src/lib/server/eliom_cookie.ml
similarity index 100%
rename from src/lib/eliom_cookie.server.ml
rename to src/lib/server/eliom_cookie.ml
diff --git a/src/lib/eliom_cookie.server.mli b/src/lib/server/eliom_cookie.mli
similarity index 100%
rename from src/lib/eliom_cookie.server.mli
rename to src/lib/server/eliom_cookie.mli
diff --git a/src/lib/server/eliom_cookies_base.ml b/src/lib/server/eliom_cookies_base.ml
new file mode 120000
index 0000000000..f8f958fb69
--- /dev/null
+++ b/src/lib/server/eliom_cookies_base.ml
@@ -0,0 +1 @@
+../shared/eliom_cookies_base.ml
\ No newline at end of file
diff --git a/src/lib/eliom_error_pages.server.ml b/src/lib/server/eliom_error_pages.ml
similarity index 100%
rename from src/lib/eliom_error_pages.server.ml
rename to src/lib/server/eliom_error_pages.ml
diff --git a/src/lib/eliom_extension.server.ml b/src/lib/server/eliom_extension.ml
similarity index 100%
rename from src/lib/eliom_extension.server.ml
rename to src/lib/server/eliom_extension.ml
diff --git a/src/lib/eliom_extension.server.mli b/src/lib/server/eliom_extension.mli
similarity index 100%
rename from src/lib/eliom_extension.server.mli
rename to src/lib/server/eliom_extension.mli
diff --git a/src/lib/eliom_extension_template.server.ml b/src/lib/server/eliom_extension_template.ml
similarity index 100%
rename from src/lib/eliom_extension_template.server.ml
rename to src/lib/server/eliom_extension_template.ml
diff --git a/src/lib/server/eliom_form_sigs.mli b/src/lib/server/eliom_form_sigs.mli
new file mode 120000
index 0000000000..ff33d4f763
--- /dev/null
+++ b/src/lib/server/eliom_form_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_form_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_mkreg.server.ml b/src/lib/server/eliom_mkreg.ml
similarity index 100%
rename from src/lib/eliom_mkreg.server.ml
rename to src/lib/server/eliom_mkreg.ml
diff --git a/src/lib/eliom_mkreg.server.mli b/src/lib/server/eliom_mkreg.mli
similarity index 100%
rename from src/lib/eliom_mkreg.server.mli
rename to src/lib/server/eliom_mkreg.mli
diff --git a/src/lib/eliom_notif.server.ml b/src/lib/server/eliom_notif.ml
similarity index 100%
rename from src/lib/eliom_notif.server.ml
rename to src/lib/server/eliom_notif.ml
diff --git a/src/lib/eliom_notif.server.mli b/src/lib/server/eliom_notif.mli
similarity index 100%
rename from src/lib/eliom_notif.server.mli
rename to src/lib/server/eliom_notif.mli
diff --git a/src/lib/eliom_parameter.server.ml b/src/lib/server/eliom_parameter.ml
similarity index 100%
rename from src/lib/eliom_parameter.server.ml
rename to src/lib/server/eliom_parameter.ml
diff --git a/src/lib/eliom_parameter.server.mli b/src/lib/server/eliom_parameter.mli
similarity index 100%
rename from src/lib/eliom_parameter.server.mli
rename to src/lib/server/eliom_parameter.mli
diff --git a/src/lib/server/eliom_parameter_base.ml b/src/lib/server/eliom_parameter_base.ml
new file mode 120000
index 0000000000..e58afb653c
--- /dev/null
+++ b/src/lib/server/eliom_parameter_base.ml
@@ -0,0 +1 @@
+../shared/eliom_parameter_base.ml
\ No newline at end of file
diff --git a/src/lib/server/eliom_parameter_sigs.mli b/src/lib/server/eliom_parameter_sigs.mli
new file mode 120000
index 0000000000..4208352c3b
--- /dev/null
+++ b/src/lib/server/eliom_parameter_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_parameter_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_process.server.ml b/src/lib/server/eliom_process.ml
similarity index 100%
rename from src/lib/eliom_process.server.ml
rename to src/lib/server/eliom_process.ml
diff --git a/src/lib/eliom_react.server.ml b/src/lib/server/eliom_react.ml
similarity index 100%
rename from src/lib/eliom_react.server.ml
rename to src/lib/server/eliom_react.ml
diff --git a/src/lib/eliom_react.server.mli b/src/lib/server/eliom_react.mli
similarity index 100%
rename from src/lib/eliom_react.server.mli
rename to src/lib/server/eliom_react.mli
diff --git a/src/lib/eliom_reference.server.ml b/src/lib/server/eliom_reference.ml
similarity index 100%
rename from src/lib/eliom_reference.server.ml
rename to src/lib/server/eliom_reference.ml
diff --git a/src/lib/eliom_reference.server.mli b/src/lib/server/eliom_reference.mli
similarity index 100%
rename from src/lib/eliom_reference.server.mli
rename to src/lib/server/eliom_reference.mli
diff --git a/src/lib/eliom_registration.server.ml b/src/lib/server/eliom_registration.ml
similarity index 100%
rename from src/lib/eliom_registration.server.ml
rename to src/lib/server/eliom_registration.ml
diff --git a/src/lib/eliom_registration.server.mli b/src/lib/server/eliom_registration.mli
similarity index 100%
rename from src/lib/eliom_registration.server.mli
rename to src/lib/server/eliom_registration.mli
diff --git a/src/lib/server/eliom_registration_sigs.mli b/src/lib/server/eliom_registration_sigs.mli
new file mode 120000
index 0000000000..ab28cbf30e
--- /dev/null
+++ b/src/lib/server/eliom_registration_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_registration_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_route.server.ml b/src/lib/server/eliom_route.ml
similarity index 100%
rename from src/lib/eliom_route.server.ml
rename to src/lib/server/eliom_route.ml
diff --git a/src/lib/eliom_route.server.mli b/src/lib/server/eliom_route.mli
similarity index 100%
rename from src/lib/eliom_route.server.mli
rename to src/lib/server/eliom_route.mli
diff --git a/src/lib/server/eliom_route_base.ml b/src/lib/server/eliom_route_base.ml
new file mode 120000
index 0000000000..e94824dbcd
--- /dev/null
+++ b/src/lib/server/eliom_route_base.ml
@@ -0,0 +1 @@
+../shared/eliom_route_base.ml
\ No newline at end of file
diff --git a/src/lib/eliom_service.server.ml b/src/lib/server/eliom_service.ml
similarity index 100%
rename from src/lib/eliom_service.server.ml
rename to src/lib/server/eliom_service.ml
diff --git a/src/lib/eliom_service.server.mli b/src/lib/server/eliom_service.mli
similarity index 100%
rename from src/lib/eliom_service.server.mli
rename to src/lib/server/eliom_service.mli
diff --git a/src/lib/server/eliom_service_sigs.mli b/src/lib/server/eliom_service_sigs.mli
new file mode 120000
index 0000000000..e92688d810
--- /dev/null
+++ b/src/lib/server/eliom_service_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_service_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_shared.server.mli b/src/lib/server/eliom_shared.mli
similarity index 100%
rename from src/lib/eliom_shared.server.mli
rename to src/lib/server/eliom_shared.mli
diff --git a/src/lib/server/eliom_shared_sigs.mli b/src/lib/server/eliom_shared_sigs.mli
new file mode 120000
index 0000000000..e073cdca27
--- /dev/null
+++ b/src/lib/server/eliom_shared_sigs.mli
@@ -0,0 +1 @@
+../shared/eliom_shared_sigs.mli
\ No newline at end of file
diff --git a/src/lib/eliom_state.server.ml b/src/lib/server/eliom_state.ml
similarity index 100%
rename from src/lib/eliom_state.server.ml
rename to src/lib/server/eliom_state.ml
diff --git a/src/lib/eliom_state.server.mli b/src/lib/server/eliom_state.mli
similarity index 100%
rename from src/lib/eliom_state.server.mli
rename to src/lib/server/eliom_state.mli
diff --git a/src/lib/eliom_syntax.server.ml b/src/lib/server/eliom_syntax.ml
similarity index 100%
rename from src/lib/eliom_syntax.server.ml
rename to src/lib/server/eliom_syntax.ml
diff --git a/src/lib/eliom_syntax.server.mli b/src/lib/server/eliom_syntax.mli
similarity index 100%
rename from src/lib/eliom_syntax.server.mli
rename to src/lib/server/eliom_syntax.mli
diff --git a/src/lib/eliom_types.server.ml b/src/lib/server/eliom_types.ml
similarity index 100%
rename from src/lib/eliom_types.server.ml
rename to src/lib/server/eliom_types.ml
diff --git a/src/lib/eliom_types.server.mli b/src/lib/server/eliom_types.mli
similarity index 100%
rename from src/lib/eliom_types.server.mli
rename to src/lib/server/eliom_types.mli
diff --git a/src/lib/server/eliom_types_base.ml b/src/lib/server/eliom_types_base.ml
new file mode 120000
index 0000000000..5fa16e6096
--- /dev/null
+++ b/src/lib/server/eliom_types_base.ml
@@ -0,0 +1 @@
+../shared/eliom_types_base.ml
\ No newline at end of file
diff --git a/src/lib/server/eliom_types_base.mli b/src/lib/server/eliom_types_base.mli
new file mode 120000
index 0000000000..3ad05bdc91
--- /dev/null
+++ b/src/lib/server/eliom_types_base.mli
@@ -0,0 +1 @@
+../shared/eliom_types_base.mli
\ No newline at end of file
diff --git a/src/lib/server/eliom_uri.ml b/src/lib/server/eliom_uri.ml
new file mode 120000
index 0000000000..5e190bb44f
--- /dev/null
+++ b/src/lib/server/eliom_uri.ml
@@ -0,0 +1 @@
+../shared/eliom_uri.ml
\ No newline at end of file
diff --git a/src/lib/server/eliom_uri.mli b/src/lib/server/eliom_uri.mli
new file mode 120000
index 0000000000..59abb18a68
--- /dev/null
+++ b/src/lib/server/eliom_uri.mli
@@ -0,0 +1 @@
+../shared/eliom_uri.mli
\ No newline at end of file
diff --git a/src/lib/server/eliommod_sersess.ml b/src/lib/server/eliommod_sersess.ml
index 478b0d5b53..7d1c4e2b8d 100644
--- a/src/lib/server/eliommod_sersess.ml
+++ b/src/lib/server/eliommod_sersess.ml
@@ -39,7 +39,7 @@ let close_service_state ~scope ~secure_o ?sp () =
     let ((cookie_info, _, _), secure_ci) =
       Eliom_common.get_cookie_info sp cookie_level
     in
-    let sitedata = Eliom_request_info.get_sitedata_sp sp in
+    let sitedata = Eliom_request_info.get_sitedata_sp ~sp in
     let cookie_info, secure =
       compute_cookie_info sitedata secure_o secure_ci cookie_info
     in
@@ -64,7 +64,7 @@ let close_service_state ~scope ~secure_o ?sp () =
                     !(c.Eliom_common.sc_session_group)
                 with
                   | None -> Lwt_log.ign_error ~section:Lwt_log.eliom "No group of groups. Please report this problem."
-                  | Some (service_table, g) ->
+                  | Some (_service_table, g) ->
                     Eliommod_sessiongroups.Serv.remove g
               end
             | `Session _
@@ -80,7 +80,7 @@ let close_service_state ~scope ~secure_o ?sp () =
 
 
 let fullsessgrp ~cookie_level ~sp set_session_group =
-  let sitedata = Eliom_request_info.get_sitedata_sp sp in
+  let sitedata = Eliom_request_info.get_sitedata_sp ~sp in
   Eliommod_sessiongroups.make_full_group_name
     ~cookie_level
     (Eliom_request_info.get_request_sp sp).Ocsigen_extensions.request_info
@@ -155,7 +155,7 @@ let rec find_or_create_service_cookie_ ?set_session_group
   let ((cookie_info, _, _), secure_ci) =
     Eliom_common.get_cookie_info sp cookie_level
   in
-  let sitedata = Eliom_request_info.get_sitedata_sp sp in
+  let sitedata = Eliom_request_info.get_sitedata_sp ~sp in
   let cookie_info, secure =
     compute_cookie_info sitedata secure_o secure_ci cookie_info
   in
@@ -164,7 +164,7 @@ let rec find_or_create_service_cookie_ ?set_session_group
 
   try
 
-    let (old, ior) =
+    let (_old, ior) =
       Eliom_common.Full_state_name_table.find full_st_name !cookie_info
     in
     match !ior with
@@ -182,7 +182,7 @@ let rec find_or_create_service_cookie_ ?set_session_group
     | Eliom_common.SC c ->
       (match set_session_group with
         | None -> ()
-        | Some session_group ->
+        | Some _session_group ->
           let fullsessgrp = fullsessgrp ~cookie_level ~sp set_session_group in
           let node = Eliommod_sessiongroups.Serv.move
             sitedata
@@ -236,7 +236,7 @@ let find_service_cookie_only ~cookie_scope ~secure_o ?sp () =
     Eliom_common.get_cookie_info sp
       (Eliom_common.cookie_level_of_user_scope cookie_scope)
   in
-  let sitedata = Eliom_request_info.get_sitedata_sp sp in
+  let sitedata = Eliom_request_info.get_sitedata_sp ~sp in
   let cookie_info, secure =
     compute_cookie_info sitedata secure_o secure_ci cookie_info
   in
diff --git a/src/lib/eliom_client_base.shared.ml b/src/lib/shared/eliom_client_base.ml
similarity index 100%
rename from src/lib/eliom_client_base.shared.ml
rename to src/lib/shared/eliom_client_base.ml
diff --git a/src/lib/eliom_comet_base.shared.ml b/src/lib/shared/eliom_comet_base.ml
similarity index 100%
rename from src/lib/eliom_comet_base.shared.ml
rename to src/lib/shared/eliom_comet_base.ml
diff --git a/src/lib/eliom_comet_base.shared.mli b/src/lib/shared/eliom_comet_base.mli
similarity index 100%
rename from src/lib/eliom_comet_base.shared.mli
rename to src/lib/shared/eliom_comet_base.mli
diff --git a/src/lib/eliom_common_base.shared.ml b/src/lib/shared/eliom_common_base.ml
similarity index 100%
rename from src/lib/eliom_common_base.shared.ml
rename to src/lib/shared/eliom_common_base.ml
diff --git a/src/lib/eliom_content_sigs.shared.mli b/src/lib/shared/eliom_content_sigs.mli
similarity index 100%
rename from src/lib/eliom_content_sigs.shared.mli
rename to src/lib/shared/eliom_content_sigs.mli
diff --git a/src/lib/eliom_cookies_base.shared.ml b/src/lib/shared/eliom_cookies_base.ml
similarity index 100%
rename from src/lib/eliom_cookies_base.shared.ml
rename to src/lib/shared/eliom_cookies_base.ml
diff --git a/src/lib/eliom_form_sigs.shared.mli b/src/lib/shared/eliom_form_sigs.mli
similarity index 100%
rename from src/lib/eliom_form_sigs.shared.mli
rename to src/lib/shared/eliom_form_sigs.mli
diff --git a/src/lib/eliom_lib_base.shared.ml b/src/lib/shared/eliom_lib_base.ml
similarity index 100%
rename from src/lib/eliom_lib_base.shared.ml
rename to src/lib/shared/eliom_lib_base.ml
diff --git a/src/lib/eliom_lib_base.shared.mli b/src/lib/shared/eliom_lib_base.mli
similarity index 100%
rename from src/lib/eliom_lib_base.shared.mli
rename to src/lib/shared/eliom_lib_base.mli
diff --git a/src/lib/eliom_parameter_base.shared.ml b/src/lib/shared/eliom_parameter_base.ml
similarity index 100%
rename from src/lib/eliom_parameter_base.shared.ml
rename to src/lib/shared/eliom_parameter_base.ml
diff --git a/src/lib/eliom_parameter_sigs.shared.mli b/src/lib/shared/eliom_parameter_sigs.mli
similarity index 100%
rename from src/lib/eliom_parameter_sigs.shared.mli
rename to src/lib/shared/eliom_parameter_sigs.mli
diff --git a/src/lib/eliom_registration_sigs.shared.mli b/src/lib/shared/eliom_registration_sigs.mli
similarity index 100%
rename from src/lib/eliom_registration_sigs.shared.mli
rename to src/lib/shared/eliom_registration_sigs.mli
diff --git a/src/lib/eliom_route_base.shared.ml b/src/lib/shared/eliom_route_base.ml
similarity index 100%
rename from src/lib/eliom_route_base.shared.ml
rename to src/lib/shared/eliom_route_base.ml
diff --git a/src/lib/eliom_runtime.shared.ml b/src/lib/shared/eliom_runtime.ml
similarity index 100%
rename from src/lib/eliom_runtime.shared.ml
rename to src/lib/shared/eliom_runtime.ml
diff --git a/src/lib/eliom_runtime.shared.mli b/src/lib/shared/eliom_runtime.mli
similarity index 100%
rename from src/lib/eliom_runtime.shared.mli
rename to src/lib/shared/eliom_runtime.mli
diff --git a/src/lib/eliom_service_sigs.shared.mli b/src/lib/shared/eliom_service_sigs.mli
similarity index 100%
rename from src/lib/eliom_service_sigs.shared.mli
rename to src/lib/shared/eliom_service_sigs.mli
diff --git a/src/lib/eliom_shared_sigs.shared.mli b/src/lib/shared/eliom_shared_sigs.mli
similarity index 100%
rename from src/lib/eliom_shared_sigs.shared.mli
rename to src/lib/shared/eliom_shared_sigs.mli
diff --git a/src/lib/eliom_types_base.shared.ml b/src/lib/shared/eliom_types_base.ml
similarity index 100%
rename from src/lib/eliom_types_base.shared.ml
rename to src/lib/shared/eliom_types_base.ml
diff --git a/src/lib/eliom_types_base.shared.mli b/src/lib/shared/eliom_types_base.mli
similarity index 100%
rename from src/lib/eliom_types_base.shared.mli
rename to src/lib/shared/eliom_types_base.mli
diff --git a/src/lib/eliom_uri.shared.ml b/src/lib/shared/eliom_uri.ml
similarity index 100%
rename from src/lib/eliom_uri.shared.ml
rename to src/lib/shared/eliom_uri.ml
diff --git a/src/lib/eliom_uri.shared.mli b/src/lib/shared/eliom_uri.mli
similarity index 100%
rename from src/lib/eliom_uri.shared.mli
rename to src/lib/shared/eliom_uri.mli
diff --git a/src/ocamlbuild/ocamlbuild_eliom.ml b/src/ocamlbuild/ocamlbuild_eliom.ml
index ecf99050d4..5efbd02b2a 100644
--- a/src/ocamlbuild/ocamlbuild_eliom.ml
+++ b/src/ocamlbuild/ocamlbuild_eliom.ml
@@ -69,11 +69,11 @@ module MakeIntern (I : INTERNALS)(Eliom : ELIOM) = struct
 
   let get_eliom_syntax_ppx = function
     | `Client ->
-      "eliom.ppx.client"
+      "ppx_eliom.ppx.client"
     | `Server ->
-      "eliom.ppx.server"
+      "ppx_eliom.ppx.server"
     | `Type ->
-      "eliom.ppx.type"
+      "ppx_eliom.ppx.type"
 
   let get_syntaxes_p4 with_eliom_syntax eliom_syntax src =
     let eliom_syntax = get_eliom_syntax_p4 eliom_syntax in
diff --git a/src/ppx/.merlin b/src/ppx/.merlin
deleted file mode 100644
index 7696577005..0000000000
--- a/src/ppx/.merlin
+++ /dev/null
@@ -1,4 +0,0 @@
-PKG compiler-libs.common
-PKG ppx_tools ppx_tools.metaquot
-
-REC
diff --git a/src/ppx/_tags b/src/ppx/_tags
deleted file mode 100644
index 989b3c6d58..0000000000
--- a/src/ppx/_tags
+++ /dev/null
@@ -1 +0,0 @@
-true:warn(+A-4-6-7-9-40-42-44-48)
diff --git a/src/ppx/ppx_eliom.ml b/src/ppx/ppx_eliom.ml
deleted file mode 100644
index d743cf2d35..0000000000
--- a/src/ppx/ppx_eliom.ml
+++ /dev/null
@@ -1 +0,0 @@
-(* This file is not empty. *)
diff --git a/src/ppx/ppx_eliom.mli b/src/ppx/ppx_eliom.mli
deleted file mode 100644
index a5a497fddb..0000000000
--- a/src/ppx/ppx_eliom.mli
+++ /dev/null
@@ -1,4 +0,0 @@
-(**
-Eliom PPX syntax extension. For documentation, refer to
-{% <<a_manual chapter="ppx-syntax"|the corresponding manual page.>>%}
-*)
diff --git a/src/ppx/ppx_eliom_client.ml b/src/ppx/ppx_eliom_client.ml
deleted file mode 100644
index d74046c433..0000000000
--- a/src/ppx/ppx_eliom_client.ml
+++ /dev/null
@@ -1,261 +0,0 @@
-open Parsetree
-open Asttypes
-open Ast_helper
-
-module AC = Ast_convenience
-module AM = Ast_mapper
-
-open Ppx_eliom_utils
-
-module Pass = struct
-
-  (** {2 Auxiliaries} *)
-
-  (* Replace every escaped identifier [v] with
-     [Eliom_client_core.Syntax_helpers.get_escaped_value v] *)
-  let map_get_escaped_values =
-    let mapper =
-      {Ast_mapper.default_mapper with
-       expr = (fun mapper e ->
-         match e.pexp_desc with
-         | Pexp_ident {txt} when Mli.is_escaped_ident @@ Longident.last txt ->
-           [%expr Eliom_client_core.Syntax_helpers.get_escaped_value [%e e] ]
-           [@metaloc e.pexp_loc]
-         | _ -> AM.default_mapper.expr mapper e
-       );
-      }
-    in
-    fun expr -> mapper.expr mapper expr
-
-  let push_escaped_binding, flush_escaped_bindings =
-    let server_arg_ids = ref [] in
-    let is_unknown gen_id =
-      List.for_all
-        (fun (gen_id', _) -> gen_id.txt <> gen_id'.txt)
-        !server_arg_ids
-    in
-    let push gen_id (expr : expression) =
-      if is_unknown gen_id then
-        server_arg_ids := (gen_id, expr) :: !server_arg_ids
-    in
-    let flush () =
-      let res = List.rev !server_arg_ids in
-      server_arg_ids := [];
-      res
-    in
-    push, flush
-
-  let mark_injection, flush_injection =
-    let has_injection = ref false in
-    let mark () = has_injection := true in
-    let flush () =
-      let x = !has_injection in
-      has_injection := false ;
-      x
-    in
-    mark, flush
-
-  let push_client_value_data, flush_client_value_datas =
-    let client_value_datas = ref [] in
-    let push gen_num gen_id expr (args : string Location.loc list) =
-      client_value_datas :=
-        (gen_num, gen_id, expr, args) :: !client_value_datas
-    in
-    let flush () =
-      let res = List.rev !client_value_datas in
-      client_value_datas := [];
-      res
-    in
-    push, flush
-
-  let find_escaped_ident id =
-    if Mli.exists () then Mli.find_escaped_ident id else [%type: _]
-
-  let find_injected_ident id =
-    if Mli.exists () then Mli.find_injected_ident id else [%type: _]
-
-  let find_fragment id =
-    if Mli.exists () then Mli.find_fragment id else [%type: _]
-
-  let register_client_closures client_value_datas =
-    let registrations =
-      List.map
-        (fun (num, id, expr, args) ->
-           let typ = find_fragment id in
-           let args = List.map Pat.var args in
-           [%expr
-             Eliom_client_core.Syntax_helpers.register_client_closure
-               [%e AC.str num]
-               (fun [%p pat_args args] ->
-                  ([%e map_get_escaped_values expr] : [%t typ]))
-           ] [@metaloc expr.pexp_loc]
-        )
-        client_value_datas
-    in
-    match registrations with
-    | [] -> []
-    | _ -> [Str.eval (AC.sequence registrations)]
-
-  (* We hoist the body of client fragments to enforce the correct scoping:
-     Identifiers declared earlier in the client section should not be
-     visible inside the client fragment (unless via escaped value). *)
-  let define_client_functions ~loc client_value_datas =
-    match client_value_datas with
-    | [] ->
-      []
-    | _ ->
-      let bindings =
-        List.map
-          (fun (_num, id, expr, args) ->
-             let patt = Pat.var id in
-             let typ = find_fragment id in
-             let args = List.map Pat.var args in
-             let expr =
-               [%expr
-                 fun [%p pat_args args] -> ([%e expr] : [%t typ])
-               ] [@metaloc loc]
-             in
-             Vb.mk ~loc patt expr)
-          client_value_datas
-      in
-      [Str.value ~loc Nonrecursive bindings]
-
-  (* For injections *)
-
-  let close_server_section loc =
-    [%stri
-      let () =
-        Eliom_client_core.Syntax_helpers.close_server_section
-          [%e eid @@ id_file_hash loc]
-    ][@metaloc loc]
-
-  let may_close_server_section ~no_fragment item =
-    if no_fragment
-    then []
-    else [close_server_section item.pstr_loc]
-
-
-  let open_client_section loc =
-    [%stri
-      let () =
-        Eliom_client_core.Syntax_helpers.open_client_section
-          [%e eid @@ id_file_hash loc]
-    ][@metaloc loc]
-
-  let may_open_client_section loc =
-    if flush_injection ()
-    then [ open_client_section loc ]
-    else []
-
-  (** Syntax extension *)
-
-  let client_str item =
-    let loc = item.pstr_loc in
-    may_open_client_section loc @
-    [ item ]
-
-  let server_str no_fragment item =
-    register_client_closures (flush_client_value_datas ()) @
-    may_close_server_section ~no_fragment item
-
-  let shared_str no_fragment item =
-    let loc = item.pstr_loc in
-    let client_expr_data = flush_client_value_datas () in
-    may_open_client_section loc @
-    register_client_closures client_expr_data @
-    define_client_functions loc client_expr_data @
-    [ item ] @
-    may_close_server_section ~no_fragment item
-
-  let fragment ?typ:_ ~context ~num ~id expr =
-
-    let loc = expr.pexp_loc in
-    let frag_eid = eid id in
-    let escaped_bindings = flush_escaped_bindings () in
-
-    push_client_value_data num id expr
-      (List.map fst escaped_bindings);
-
-    match context, escaped_bindings with
-    | `Server, _ ->
-      (* We are in a server fragment, this code should always be discarded. *)
-      Exp.extension @@ AM.extension_of_error @@ Location.errorf "Eliom: ICE"
-    | `Shared, [] ->
-      [%expr [%e frag_eid] ()][@metaloc loc]
-    | `Shared, _ ->
-      let bindings =
-        List.map
-          (fun (gen_id, expr) ->
-             Vb.mk ~loc:expr.pexp_loc (Pat.var gen_id) expr )
-          escaped_bindings
-      in
-      let args =
-        format_args @@ List.map
-          (fun (id, _) -> eid id)
-          escaped_bindings
-      in
-      Exp.let_ ~loc
-        Nonrecursive
-        bindings
-        [%expr [%e frag_eid] [%e args]][@metaloc loc]
-
-
-
-  let escape_inject ?ident ~(context:Context.escape_inject) ~id expr =
-    let loc = expr.pexp_loc in
-    let frag_eid = eid id in
-
-    let assert_no_variables t =
-      let typ mapper = function
-        | {ptyp_desc = Ptyp_var _ } as typ ->
-          let attr =
-            AM.attribute_of_warning loc
-              "The type of this injected value contains a type variable \
-               that could be wrongly inferred."
-          in
-          { typ with ptyp_attributes = attr :: typ.ptyp_attributes }
-        | typ -> AM.default_mapper.typ mapper typ
-      in
-      let m = { AM.default_mapper with typ } in
-      m.AM.typ m t
-    in
-
-    match context with
-
-    (* [%%server [%client ~%( ... ) ] ] *)
-    | `Escaped_value _section ->
-      let typ = find_escaped_ident id in
-      let typ = assert_no_variables typ in
-      push_escaped_binding id expr;
-      [%expr ([%e frag_eid] : [%t typ]) ][@metaloc loc]
-
-
-    (* [%%server ... %x ... ] *)
-    | `Injection _section ->
-      mark_injection () ;
-      let typ = find_injected_ident id in
-      let typ = assert_no_variables typ in
-      let ident = match ident with
-        | None   -> [%expr None]
-        | Some i -> [%expr Some [%e AC.str i]]
-      in
-      let (u, d) = Mli.get_injected_ident_info id.txt in
-      let es = (AC.str @@ Printf.sprintf "%s%d" u d)[@metaloc id.loc] in
-      [%expr
-        (Eliom_client_core.Syntax_helpers.get_injection
-           ?ident:([%e ident])
-           ~pos:([%e position loc])
-           [%e es]
-         : [%t typ])
-      ][@metaloc loc]
-
-  let shared_sig item = [item]
-  let server_sig _    = []
-  let client_sig item = [item]
-
-  let prelude _ = []
-  let postlude _ = []
-
-end
-
-include Make(Pass)
diff --git a/src/ppx/ppx_eliom_client.mli b/src/ppx/ppx_eliom_client.mli
deleted file mode 100644
index be5a2dd400..0000000000
--- a/src/ppx/ppx_eliom_client.mli
+++ /dev/null
@@ -1,2 +0,0 @@
-
-val mapper : string list -> Ast_mapper.mapper
diff --git a/src/ppx/ppx_eliom_client_ex.ml b/src/ppx/ppx_eliom_client_ex.ml
deleted file mode 100644
index 49798061b9..0000000000
--- a/src/ppx/ppx_eliom_client_ex.ml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-let () = Ast_mapper.run_main Ppx_eliom_client.mapper
diff --git a/src/ppx/ppx_eliom_server.ml b/src/ppx/ppx_eliom_server.ml
deleted file mode 100644
index 7b8734c479..0000000000
--- a/src/ppx/ppx_eliom_server.ml
+++ /dev/null
@@ -1,218 +0,0 @@
-(* Ocsigen
- * http://www.ocsigen.org
- * Copyright (C) 2010-2011
- * Raphaël Proust, Grégoire Henry, Gabriel Radanne
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *)
-
-(* This prepocessor generates the module to be loaded by Ocsigen server *)
-
-open Parsetree
-open Asttypes
-open Ast_helper
-
-module AC = Ast_convenience
-module AM = Ast_mapper
-
-open Ppx_eliom_utils
-
-module Pass = struct
-
-  let push_escaped_binding, flush_escaped_bindings =
-    let args = ref [] in
-    let push orig_expr id =
-      if List.for_all (function id', _ -> id.txt <> id'.txt) !args then
-        args := (id, orig_expr) :: !args;
-    in
-    let flush () =
-      let res = List.rev !args in
-      args := [];
-      let aux (_, arg) =
-        [%expr Eliom_syntax.escaped_value [%e arg ] ]
-        [@metaloc arg.pexp_loc]
-      in
-      List.map aux res
-    in
-    push, flush
-
-  module SSet = Set.Make (String)
-
-  let push_injection, flush_injections =
-    let buffer : (_ * _ * _) list ref = ref [] in
-    let gen_ids = ref SSet.empty in
-    let push ?ident id orig_expr =
-      if not (SSet.mem id !gen_ids) then
-        (gen_ids := SSet.add id !gen_ids;
-         buffer := (id, orig_expr,ident) :: !buffer)
-    in
-    let flush_all () =
-      let res = List.rev !buffer in
-      gen_ids := SSet.empty;
-      buffer := [];
-      res
-    in
-    let global_known = ref SSet.empty in
-    let flush () =
-      let all = flush_all () in
-      let novel =
-        let is_fresh (gen_id, _,_) =
-          not (SSet.mem gen_id !global_known)
-        in
-        List.filter is_fresh all
-      in
-      List.iter
-        (function gen_id, _, _ ->
-           global_known := SSet.add gen_id !global_known)
-        novel;
-      all
-    in
-    push, flush
-
-  (* For every injection of $orig_expr$ as $gen_id$:
-     let $gen_id$ = $orig_expr$ and ...
-     (Necessary for injections in shared section) *)
-  let bind_injected_idents injections =
-    assert (injections <> []);
-    let bindings =
-      List.map
-        (fun (txt, expr,_) ->
-           let loc = expr.pexp_loc in
-           Vb.mk ~loc (Pat.var ~loc {txt;loc}) expr)
-        injections
-    in
-    Str.value Nonrecursive bindings
-
-  let close_server_section loc =
-    [%stri
-      let () =
-        Eliom_syntax.close_server_section
-          [%e eid @@ id_file_hash loc]
-    ] [@metaloc loc]
-
-  let may_close_server_section ~no_fragment loc =
-    if no_fragment
-    then []
-    else [close_server_section loc]
-
-
-  let close_client_section loc injections =
-    assert (injections <> []) ;
-    let injection_list =
-      List.fold_right
-        (fun (txt, expr, ident) sofar ->
-           let loc = expr.pexp_loc in
-           let loc_expr = position loc in
-           let frag_eid = eid {txt;loc} in
-           let ident = match ident with
-             | None -> [%expr None]
-             | Some i -> [%expr Some [%e AC.str i ]] in
-           let (_, num) = Mli.get_injected_ident_info txt in
-           [%expr
-             ([%e AC.int num],
-              Eliom_lib.to_poly [%e frag_eid ],
-              [%e loc_expr], [%e ident ]) :: [%e sofar ]
-           ])
-        injections
-        [%expr []]
-    in
-    [%stri
-      let () =
-        Eliom_syntax.close_client_section
-          [%e eid @@ id_file_hash loc ]
-          [%e injection_list ]
-    ][@metaloc loc]
-
-
-  (** Syntax extension *)
-
-  let client_str item =
-    let all_injections = flush_injections () in
-    let loc = item.pstr_loc in
-    match all_injections with
-    | [] -> []
-    | l  ->
-      bind_injected_idents l ::
-      [ close_client_section loc all_injections ]
-
-  let server_str no_fragment item =
-    let loc = item.pstr_loc in
-    item ::
-    may_close_server_section ~no_fragment loc
-
-  let shared_str no_fragment item =
-    let all_injections = flush_injections () in
-    let loc = item.pstr_loc in
-    let cl =
-      item ::
-      may_close_server_section ~no_fragment loc
-    in
-    match all_injections with
-    | [] -> cl
-    | l ->
-      bind_injected_idents l ::
-      cl @
-      [ close_client_section loc all_injections ]
-
-  let fragment ?typ ~context:_ ~num ~id expr =
-    let typ =
-      match typ with
-      | Some typ -> typ
-      | None when not (Mli.exists ()) ->
-        [%type: _]
-      | None ->
-        match Mli.find_fragment id with
-        | { ptyp_desc = Ptyp_var _ } ->
-          let loc = expr.pexp_loc in
-          Typ.extension ~loc @@ AM.extension_of_error @@ Location.errorf ~loc
-            "The types of client values must be monomorphic from its usage \
-             or from its type annotation"
-        | typ -> typ
-    in
-    let loc = expr.pexp_loc in
-    let e = format_args @@ flush_escaped_bindings () in
-    [%expr
-      (Eliom_syntax.client_value
-         ~pos:([%e position loc ])
-         [%e AC.str num ]
-         [%e e ]
-       : [%t typ ] Eliom_client_value.t)
-    ][@metaloc loc]
-
-  let escape_inject ?ident ~(context:Context.escape_inject) ~id expr =
-    match context with
-    | `Escaped_value _ ->
-      push_escaped_binding expr id;
-      [%expr assert false ]
-    | `Injection _ ->
-      push_injection ?ident id.txt expr;
-      eid id
-
-  let set_global ~loc b =
-    let b = Exp.construct ~loc
-        {loc ; txt = Longident.Lident (if b then "true" else "false")} None
-    in
-    [%stri let () = Eliom_syntax.set_global [%e b ] ]
-
-  let prelude loc = [ set_global ~loc true ]
-  let postlude loc = [ set_global ~loc false ]
-
-  let shared_sig item = [item]
-  let server_sig item = [item]
-  let client_sig _    = []
-
-end
-
-include Make(Pass)
diff --git a/src/ppx/ppx_eliom_server.mli b/src/ppx/ppx_eliom_server.mli
deleted file mode 100644
index be5a2dd400..0000000000
--- a/src/ppx/ppx_eliom_server.mli
+++ /dev/null
@@ -1,2 +0,0 @@
-
-val mapper : string list -> Ast_mapper.mapper
diff --git a/src/ppx/ppx_eliom_server_ex.ml b/src/ppx/ppx_eliom_server_ex.ml
deleted file mode 100644
index e2e89a829b..0000000000
--- a/src/ppx/ppx_eliom_server_ex.ml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-let () = Ast_mapper.run_main Ppx_eliom_server.mapper
diff --git a/src/ppx/ppx_eliom_type.ml b/src/ppx/ppx_eliom_type.ml
deleted file mode 100644
index a6741c9461..0000000000
--- a/src/ppx/ppx_eliom_type.ml
+++ /dev/null
@@ -1,142 +0,0 @@
-(* Ocsigen
- * http://www.ocsigen.org
- * Copyright (C) 2010-2011
- * Raphaël Proust, Grégoire Henry, Gabriel Radanne
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *)
-
-(* This module generates the file used to infer types (hence wrappers) of server
-   escaped values.
-
-   Server-specific and escaped expression will be kept only for
-   type-checking. In order to export type of escaped expressions: it
-   generates for each escaped expression a toplevel definition that
-   looks like:
-
-     let $global_id$ = ref None
-
-   And client-side expressions are replaced by lists of initializers
-   (one per escaped expressions):
-
-     $global_id$ := Some $expr$
-
-*)
-open Parsetree
-open Asttypes
-open Ast_helper
-
-module AC = Ast_convenience
-module AM = Ast_mapper
-
-open Ppx_eliom_utils
-
-module Pass = struct
-
-  (* accumulator, push and flush for typing expression
-     $gen_id := Some $orig_expr *)
-  let push_typing_expr, flush_typing_expr =
-    let typing_expr = ref [] in
-    let add orig_expr id =
-      if List.for_all (function id', _ -> id.txt <> id'.txt) !typing_expr
-      then
-        let frag_eid = eid id in
-        typing_expr :=
-          (id,
-           [%expr [%e frag_eid] := Some [%e orig_expr]]
-             [@metaloc orig_expr.pexp_loc]
-          ) :: !typing_expr
-    in
-    let flush () =
-      let res = List.rev (List.map snd !typing_expr) in
-      typing_expr := [];
-      AC.sequence res
-    in
-    add, flush
-
-  (* accumulator, push and flush for typing str
-     let $id = ref None
-  *)
-  let push_typing_str_item, flush_typing_str_item =
-    let typing_strs = ref [] in
-    let add orig_expr id =
-      if List.for_all (function id', _ -> id'.txt <> id.txt) !typing_strs
-      then
-        typing_strs :=
-          (id,
-           [%stri let [%p Pat.var id] = Pervasives.ref None]
-           [@metaloc orig_expr.pexp_loc]
-          ) :: !typing_strs
-    in
-    let flush () =
-      let res = List.map snd !typing_strs in
-      typing_strs := [];
-      res
-    in
-    add, flush
-
-  (** Syntax extension *)
-
-  let client_str item =
-    let loc = item.pstr_loc in
-    flush_typing_str_item () @
-    [%str let () = [%e flush_typing_expr () ] ] [@metaloc loc]
-
-  let server_str _ item =
-    flush_typing_str_item () @
-    [ item ]
-
-  let shared_str _ item =
-    let loc = item.pstr_loc in
-    flush_typing_str_item () @
-    [%str let () = [%e flush_typing_expr () ] ] [@metaloc loc] @
-    [ item ]
-
-  let fragment ?typ ~context:_ ~num:_ ~id expr =
-    let loc = expr.pexp_loc in
-    let frag_eid = eid id in
-    push_typing_str_item expr id;
-    let typ = match typ with
-      | Some typ -> typ
-      | None -> Typ.any ~loc ()
-    in
-    [%expr
-      [%e flush_typing_expr () ];
-      [%e frag_eid] :=
-        Some ( Eliom_syntax.client_value "" 0 :
-                 [%t typ] Eliom_client_value.t);
-      match ! [%e frag_eid] with
-      | Some x -> (x : _ Eliom_client_value.t)
-      | None -> assert false
-    ]
-
-  let escape_inject ?ident:_ ~(context:Context.escape_inject) ~id expr =
-    push_typing_str_item expr id;
-    push_typing_expr expr id;
-    match context with
-    | `Escaped_value _ -> [%expr assert false]
-    | `Injection `Shared -> expr
-    | `Injection `Client -> [%expr assert false]
-
-  let prelude _ = []
-  let postlude _ = []
-
-  let shared_sig _ = []
-  let server_sig _ = []
-  let client_sig _ = []
-
-end
-
-include Make(Pass)
diff --git a/src/ppx/ppx_eliom_type.mli b/src/ppx/ppx_eliom_type.mli
deleted file mode 100644
index be5a2dd400..0000000000
--- a/src/ppx/ppx_eliom_type.mli
+++ /dev/null
@@ -1,2 +0,0 @@
-
-val mapper : string list -> Ast_mapper.mapper
diff --git a/src/ppx/ppx_eliom_types_ex.ml b/src/ppx/ppx_eliom_types_ex.ml
deleted file mode 100644
index 895e1c5a57..0000000000
--- a/src/ppx/ppx_eliom_types_ex.ml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-let () = Ast_mapper.run_main Ppx_eliom_type.mapper
diff --git a/src/ppx/ppx_eliom_utils.ml b/src/ppx/ppx_eliom_utils.ml
deleted file mode 100644
index c7a4495a9d..0000000000
--- a/src/ppx/ppx_eliom_utils.ml
+++ /dev/null
@@ -1,683 +0,0 @@
-open Parsetree
-open Ast_helper
-
-module AM = Ast_mapper
-module AC = Ast_convenience
-
-(** Various misc functions *)
-
-let flatmap f l = List.flatten @@ List.map f l
-
-let get_extension = function
-  | {pexp_desc= Pexp_extension ({txt},_)} -> txt
-  | _ -> invalid_arg "Eliom ppx: Should be an extension."
-
-let in_context cref c f x =
-  let old = !cref in
-  cref := c ;
-  let res = f x in
-  cref := old ;
-  res
-
-let (%) f g x = f (g x)
-
-let exp_add_attrs attr e =
-  {e with pexp_attributes = attr}
-
-let eid {Location. txt ; loc } =
-  Exp.ident ~loc { loc ; txt = Longident.Lident txt }
-
-let format_args = function
-  | [] -> AC.unit ()
-  | [e] -> e
-  | l -> Exp.tuple l
-
-let pat_args = function
-  | [] -> AC.punit ()
-  | [p] -> p
-  | l -> Pat.tuple l
-
-(* We use a strong hash (MD5) of the file name.
-   We only keep the first 36 bit, which should be well enough: with
-   256 files, the likelihood of a collision is about one in two
-   millions.
-   These bits are encoded using an OCaml-compatible variant of Base
-   64, as the hash is used to generate OCaml identifiers. *)
-let file_hash loc =
-  let s = Digest.string loc.Location.loc_start.pos_fname in
-  let e = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_'" in
-  let o = Bytes.create 6 in
-  let g p = Char.code s.[p] in
-  for i = 0 to 5 do
-    let p = i * 6 / 8 in
-    let d = 10 - (i * 6) mod 8 in
-    Bytes.set o i e.[(g p lsl 8 + g (p + 1)) lsr d land 63]
-  done;
-  for i = 0 to 4 do
-    (* Prevent problematic '_ pattern. This confuses our sed
-       invocation in eliomc. Simply replacing the pattern here is
-       easier than tightening the sed expression. *)
-    if Bytes.get o i = '\'' && Bytes.get o (i + 1) = '_' then Bytes.set o i 'Z'
-  done;
-  Bytes.to_string o
-
-let id_file_hash loc =
-  let prefix = "__eliom__compilation_unit_id__" in
-  {Location. loc ; txt = prefix ^ file_hash loc}
-
-(** [let __eliom__compilation_unit_id__HASH = "HASH"]
-    We hoist the file hash at the beginning of each eliom file.
-    This makes the generated javascript code smaller.
-*)
-let module_hash_declaration loc =
-  let id = Pat.var ~loc @@ id_file_hash loc in
-  Str.value ~loc Nonrecursive [Vb.mk ~loc id @@ AC.str @@ file_hash loc]
-
-(** The first position in a file, if it exists.
-    We avoid {!Location.input_name}, as it's unreliable when reading multiple files.
-*)
-let file_position str = match str with
-  | { pstr_loc } :: _ -> Location.in_file @@ pstr_loc.loc_start.pos_fname
-  | [] -> Location.none
-
-let lexing_position ~loc l =
-  [%expr
-    { Lexing.pos_fname = [%e AC.str l.Lexing.pos_fname];
-      Lexing.pos_lnum = [%e AC.int @@ l.Lexing.pos_lnum];
-      Lexing.pos_bol = [%e AC.int @@ l.Lexing.pos_bol];
-      Lexing.pos_cnum = [%e AC.int @@ l.Lexing.pos_cnum]; }
-  ] [@metaloc loc]
-
-let position loc =
-  let start = loc.Location.loc_start in
-  let stop = loc.Location.loc_start in
-  Exp.tuple ~loc [ lexing_position ~loc start ; lexing_position ~loc stop ]
-
-let is_annotation txt l =
-  List.exists (fun s -> txt = s || txt = "eliom."^s) l
-
-(** Identifiers generation. *)
-module Name = struct
-
-  let escaped_ident_fmt : _ format6 =
-    "_eliom_escaped_ident_%Ld"
-
-  let fragment_ident_fmt : _ format6 =
-    "_eliom_fragment_%s"
-
-  let injected_ident_fmt : _ format6 =
-    "_eliom_injected_ident_%6s%d"
-
-  (* Identifiers for the closure representing a fragment. *)
-  let fragment_num_count = ref 0
-  let fragment_num _loc =
-    incr fragment_num_count;
-    Printf.sprintf "%s%d" (file_hash _loc) !fragment_num_count
-  let fragment_ident id =
-    Printf.sprintf fragment_ident_fmt id
-
-  (* Globaly unique ident for escaped expression *)
-  (* It's used for type inference and as argument name for the
-     closure representing the surrounding fragment. *)
-  (* Inside a fragment, same ident share the global ident. *)
-  let escaped_idents = ref []
-  let reset_escaped_ident () = escaped_idents := []
-  let escaped_expr, escaped_ident =
-    let r = ref 0L in
-    let make () =
-      r := Int64.(add one) !r ;
-      Printf.sprintf escaped_ident_fmt !r
-    in
-    let for_expr loc = Location.mkloc (make ()) loc in
-    let for_id loc id =
-      let txt =
-        try List.assoc id !escaped_idents
-        with Not_found ->
-          let gen_id = make () in
-          escaped_idents := (id, gen_id) :: !escaped_idents;
-          gen_id
-      in {Location. txt ; loc }
-    in for_expr, for_id
-
-  let injected_expr, injected_ident, reset_injected_ident =
-    let injected_idents = ref [] in
-    let r = ref 0 in
-    let gen_ident loc =
-      let hash = file_hash loc in
-      incr r;
-      let s = Printf.sprintf injected_ident_fmt hash !r in
-      {Location. txt = s ; loc }
-    in
-    let gen_injected_ident loc (s:string) =
-      try List.assoc s !injected_idents
-      with Not_found ->
-        let gen_id = gen_ident loc in
-        injected_idents := (s, gen_id) :: !injected_idents;
-        gen_id
-    and reset () = injected_idents := [] in
-    gen_ident, gen_injected_ident, reset
-
-end
-
-(* WARNING: if you change this, also change inferred_type_prefix in
-   tools/eliomc.ml and ocamlbuild/ocamlbuild_eliom.ml *)
-let inferred_type_prefix = "eliom_inferred_type_"
-
-module Mli = struct
-
-  let type_file = ref None
-  let get_type_file () = match !type_file with
-    | None -> Filename.chop_extension !Location.input_name ^ ".type_mli"
-    | Some f -> f
-
-  let exists () = match !type_file with Some _ -> true | _ -> false
-
-  let suppress_underscore =
-    let rename =
-      let c = ref 0 in
-      fun s -> incr c; Printf.sprintf "an_%s_%d" s !c
-    and has_pfix =
-      let len = String.length inferred_type_prefix in
-      fun s ->
-        String.length s >= len &&
-        String.sub s 0 len = inferred_type_prefix
-    in
-    let typ mapper ty = match ty.ptyp_desc with
-      (* | Ptyp_constr  (_, Ast.TyAny _, ty) *)
-      (* | Ptyp_constr (_, ty, Ast.TyAny _) -> ty *)
-      | Ptyp_var var when has_pfix var ->
-        mapper.AM.typ mapper
-          {ty with
-           ptyp_desc = Ptyp_var (rename var)
-          }
-      | _ -> AM.default_mapper.typ mapper ty in
-    let m = { AM.default_mapper with typ } in
-    m.AM.typ m
-
-  let is_injected_ident id =
-    try Scanf.sscanf id Name.injected_ident_fmt (fun _ _ -> true)
-    with Scanf.Scan_failure _ -> false
-
-  let is_escaped_ident id =
-    try Scanf.sscanf id Name.escaped_ident_fmt (fun _ -> true)
-    with Scanf.Scan_failure _ -> false
-
-  let is_fragment_ident id =
-    try Scanf.sscanf id Name.fragment_ident_fmt (fun _ -> true)
-    with Scanf.Scan_failure _ -> false
-
-  let get_injected_ident_info id =
-    Scanf.sscanf id Name.injected_ident_fmt (fun u n -> (u, n))
-
-  let get_fragment_type = function
-    | [%type: [%t? typ] Eliom_client_value.fragment ]
-    | [%type: [%t? typ] Eliom_client_value.t ] ->
-      Some typ
-    | _ -> None
-
-  let get_binding sig_item = match sig_item.psig_desc with
-    | Psig_value {
-      pval_name = {txt} ;
-      pval_type = [%type: [%t? typ] option ref ] } ->
-      if is_injected_ident txt || is_escaped_ident txt then
-        Some (txt, suppress_underscore typ)
-      else if is_fragment_ident txt then
-        match get_fragment_type typ with
-        | Some typ -> Some (txt, suppress_underscore typ)
-        | None -> None
-      else
-        None
-    | _ -> None
-
-  let load_file file =
-    try
-      let items =
-        Pparse.parse_interface ~tool_name:"eliom" Format.err_formatter file
-      in
-      let h = Hashtbl.create 17 in
-      let f item = match get_binding item with
-        | Some (s, typ) -> Hashtbl.add h s typ
-        | None -> ()
-      in
-      List.iter f items ;
-      h
-    with
-    | Sys_error s ->
-      Location.raise_errorf
-        ~loc:(Location.in_file file)
-        "Eliom: Error while loading types: %s" s
-
-  let inferred_sig = lazy (load_file (get_type_file ()))
-
-  let find err {Location. txt ; loc } =
-    try Hashtbl.find (Lazy.force inferred_sig) txt with
-    | Not_found ->
-      Typ.extension ~loc @@ AM.extension_of_error @@ Location.errorf ~loc
-        "Error: Inferred type of %s not found. You need to regenerate %s."
-        err (get_type_file ())
-
-  let find_escaped_ident = find "escaped ident"
-  let find_injected_ident = find "injected ident"
-  let find_fragment = find "client value"
-
-end
-
-(** Context convenience module. *)
-module Context = struct
-
-  type server = [ `Server | `Shared ]
-  type client = [ `Client | `Shared ]
-
-  let of_string = function
-    | "server" | "server.start"
-    | "eliom.server" | "eliom.server.start" -> `Server
-    | "shared" | "shared.start"
-    | "eliom.shared" | "eliom.shared.start" -> `Shared
-    | "client" | "client.start"
-    | "eliom.client" | "eliom.client.start" -> `Client
-    | _ -> invalid_arg "Eliom ppx: Not a context"
-
-  type escape_inject = [
-    | `Escaped_value of server
-    | `Injection of client
-  ]
-
-  type t = [
-    | `Server (* [%%server ... ] *)
-    | `Client (* [%%client ... ] *)
-    | `Shared (* [%%shared  ... ] *)
-    | `Fragment of server (* [%client ... ] *)
-    | `Escaped_value of server (* [%shared ~%( ... ) ] *)
-    | `Injection of client (* [%%client ~%( ... ) ] *)
-  ]
-end
-
-
-let match_args = function
-  | [ ] -> ()
-  | [ "-type" ; type_file ] -> Mli.type_file := Some type_file
-  | [ "-notype" ] -> Mli.type_file := None
-  | args -> Location.raise_errorf ~loc:Location.(in_file !input_name)
-           "Wrong arguments:@ %s" (String.concat " " args)
-
-(** Signature of specific code of a preprocessor. *)
-module type Pass = sig
-
-  (** How to handle "client", "shared" and "server" sections for top level structure items. *)
-
-  val shared_str: bool -> structure_item -> structure_item list
-  val server_str: bool -> structure_item -> structure_item list
-  val client_str: structure_item -> structure_item list
-
-  (** How to handle "client", "shared" and "server" sections for top level signature items. *)
-
-  val shared_sig: signature_item -> signature_item list
-  val client_sig: signature_item -> signature_item list
-  val server_sig: signature_item -> signature_item list
-
-  (** How to handle "[%client ...]" and "[%shared ...]" expr. *)
-  val fragment:
-    ?typ:core_type -> context:Context.server ->
-    num:string -> id:string Location.loc ->
-    expression -> expression
-
-  (** How to handle escaped "~%ident" inside a fragment. *)
-  val escape_inject:
-    ?ident:string -> context:Context.escape_inject ->
-    id:string Location.loc ->
-    expression -> expression
-
-  val prelude : loc -> structure
-  val postlude : loc -> structure
-
-end
-
-(** These functions try to guess if a given expression will lead to a fragment evaluation
-    This is not possible in general, this criteria is only syntactic
-
-    If the expression cannot have fragments, we don't need to use sections.
-    Consequently, this function should *never* return false positive.
-*)
-module Cannot_have_fragment = struct
-
-  let opt_forall p = function
-    | None -> true
-    | Some x -> p x
-
-  let vb_forall p l =
-    let p x = p x.pvb_expr in
-    List.for_all p l
-
-  let rec longident = function
-    | Longident.Lident _ -> true
-    | Longident.Ldot (x,_) -> longident x
-    | Longident.Lapply (_,_) -> false
-
-  let rec expression e = match e.pexp_desc with
-    | Pexp_ident _
-    | Pexp_constant _
-    | Pexp_function _
-    | Pexp_lazy _
-    | Pexp_fun _
-      -> true
-
-    | Pexp_newtype (_,e)
-    | Pexp_assert e
-    | Pexp_field (e,_)
-    | Pexp_constraint (e,_)
-    | Pexp_coerce (e,_,_)
-    | Pexp_poly (e,_)
-    | Pexp_try (e,_) -> expression e
-
-    | Pexp_ifthenelse (b,e1,e2) ->
-      expression b && expression e1 && opt_forall expression e2
-    | Pexp_sequence (e1,e2)
-    | Pexp_setfield (e1,_,e2) -> expression e1 && expression e2
-    | Pexp_array l
-    | Pexp_tuple l -> List.for_all expression l
-    | Pexp_record (l,e) ->
-      let p x = expression @@ snd x in
-      opt_forall expression e && List.for_all p l
-
-    | Pexp_construct (_,e)
-    | Pexp_variant (_,e) -> opt_forall expression e
-    | Pexp_let (_,l,e) -> vb_forall expression l && expression e
-    | Pexp_open (_,x,e) -> longident x.txt && expression e
-    | Pexp_letmodule (_,me,e) -> module_expr me && expression e
-
-    (* We could be more precise on those constructs *)
-    | Pexp_object _
-    | Pexp_while _
-    | Pexp_for _
-    | Pexp_match _
-    | Pexp_pack _
-      -> false
-
-    (* We can't say more using syntactic information. *)
-    | Pexp_extension _
-    | Pexp_send _
-    | Pexp_new _
-    | Pexp_setinstvar _
-    | Pexp_override _
-    | Pexp_apply _
-    | _
-      -> false
-
-  and module_expr x = match x.pmod_desc with
-    | Pmod_ident l -> longident l.txt
-    | Pmod_functor _ -> true
-    | Pmod_unpack e -> expression e
-    | Pmod_constraint (e,_) -> module_expr e
-    | Pmod_structure l -> List.for_all structure_item l
-
-    | Pmod_apply _
-    | _
-      -> false
-
-  and module_binding m = module_expr m.pmb_expr
-
-  and structure_item x = match x.pstr_desc with
-    | Pstr_type _
-    | Pstr_typext _
-    | Pstr_exception _
-    | Pstr_modtype _
-    | Pstr_class _
-    | Pstr_class_type _
-      -> true
-
-    | Pstr_eval (e,_) -> expression e
-    | Pstr_value (_,vb) -> vb_forall expression vb
-    | Pstr_primitive _ -> true
-    | Pstr_module mb -> module_binding mb
-    | Pstr_recmodule mbl -> List.for_all module_binding mbl
-    | Pstr_open x -> longident x.popen_lid.txt
-    | Pstr_include x -> module_expr x.pincl_mod
-
-    | _ -> false
-
-end
-
-(**
-   Replace shared expression by the equivalent pair.
-
-   [ [%share
-       let x = ... %s ... in
-       [%client ... %x ... ]
-     ] ]
-   ≡
-   [ let x = ... s ... in
-     [%client ... %x ... ]
-     ,
-     [%client
-       let x = ... %s ... in
-       ... x ...
-     ]
-   ]
-*)
-module Shared = struct
-
-  let server_expr mapper expr =
-    match expr with
-    | [%expr [%client [%e? _ ]]] -> expr
-    | [%expr ~% [%e? injection_expr ]] -> injection_expr
-    | _ -> AM.default_mapper.expr mapper expr
-  let server = {AM.default_mapper with expr = server_expr}
-
-  let client_expr context mapper expr =
-    match expr with
-    | [%expr [%client [%e? fragment_expr ]]] ->
-      in_context context `Fragment
-        (mapper.AM.expr mapper) fragment_expr
-    | [%expr ~% [%e? injection_expr ]] ->
-      begin match !context with
-        | `Top -> expr
-        | `Fragment -> injection_expr
-      end
-    | _ -> AM.default_mapper.expr mapper expr
-  let client = {AM.default_mapper with expr = client_expr (ref `Top)}
-
-  let expr loc expr =
-    let server_expr = server.AM.expr server expr in
-    let client_expr = client.AM.expr client expr in
-    [%expr
-      Eliom_shared.Value.create
-        [%e server_expr]
-        [%client [%e client_expr]]
-    ] [@metaloc loc]
-end
-
-module Make (Pass : Pass) = struct
-
-  let eliom_expr (context : Context.t ref) mapper expr =
-    let loc = expr.pexp_loc in
-    let attr = expr.pexp_attributes in
-    match expr, !context with
-    | {pexp_desc = Pexp_extension ({txt},_)},
-      `Client
-      when is_annotation txt ["client"; "shared"] ->
-      let side = get_extension expr in
-      Exp.extension @@ AM.extension_of_error @@ Location.errorf ~loc
-        "The syntax [%%%s ...] is not allowed inside client code."
-        side
-    | {pexp_desc = Pexp_extension ({txt},_)}
-    , (`Fragment _ | `Escaped_value _ | `Injection _)
-      when is_annotation txt ["client"; "shared"] ->
-      let side = get_extension expr in
-      Exp.extension @@ AM.extension_of_error @@ Location.errorf ~loc
-        "The syntax [%%%s ...] can not be nested."
-        side
-
-    (* [%shared ... ] *)
-    | {pexp_desc = Pexp_extension ({txt},PStr [{pstr_desc = Pstr_eval (side_val,attr')}])},
-      (`Server | `Shared)
-      when is_annotation txt ["shared"] ->
-      let e = Shared.expr loc side_val in
-      mapper.AM.expr mapper @@ exp_add_attrs (attr@attr') e
-
-    (* [%client ... ] *)
-    | {pexp_desc = Pexp_extension ({txt},PStr [{pstr_desc = Pstr_eval (side_val,attr)}])},
-      (`Server | `Shared as c)
-      when is_annotation txt ["client"] ->
-      Name.reset_escaped_ident () ;
-      let side_val, typ = match side_val with
-        | [%expr ([%e? cval]:[%t? typ]) ] -> (cval, Some typ)
-        | _ -> (side_val, None)
-      in
-      let num = Name.fragment_num side_val.pexp_loc in
-      let id = Location.mkloc (Name.fragment_ident num) side_val.pexp_loc in
-      in_context context (`Fragment c)
-        (Pass.fragment ?typ ~context:c ~num ~id % mapper.AM.expr mapper)
-        (exp_add_attrs attr side_val)
-
-    (* ~%( ... ) ] *)
-    | [%expr ~% [%e? inj ]], _ ->
-      let ident = match inj.pexp_desc with
-        | Pexp_ident i -> Some (String.concat "_" @@ Longident.flatten i.txt)
-        | _ -> None
-      in
-      begin match !context with
-        | `Client | `Shared as c ->
-          let id = match ident with
-            | Some id -> Name.injected_ident loc id
-            | None -> Name.injected_expr loc
-          in
-          let new_context = `Injection c in
-          in_context context new_context
-            (Pass.escape_inject ?ident ~context:new_context ~id %
-             mapper.AM.expr mapper)
-            inj
-        | `Fragment c ->
-          let id = match ident with
-            | None -> Name.escaped_expr loc
-            | Some id -> Name.escaped_ident loc id
-          in
-          let new_context = `Escaped_value c in
-          in_context context new_context
-            (Pass.escape_inject ?ident ~context:new_context ~id %
-             mapper.AM.expr mapper)
-            inj
-        | `Server ->
-          Location.raise_errorf ~loc
-            "The syntax ~%% ... is not allowed inside server code."
-        | `Escaped_value _ | `Injection _ ->
-          Location.raise_errorf ~loc
-            "The syntax ~%% ... can not be nested."
-      end
-    | _ -> AM.default_mapper.expr mapper expr
-
-  let structure_item mapper str =
-    let loc = str.pstr_loc in
-    match str.pstr_desc with
-    | Pstr_extension (({txt=("server"|"shared"|"client")}, _), _) ->
-      Location.raise_errorf ~loc
-        "Sections are only allowed at toplevel."
-    | _ -> AM.default_mapper.structure_item mapper str
-
-  let signature_item mapper sig_ =
-    let loc = sig_.psig_loc in
-    match sig_.psig_desc with
-    | Psig_extension (({txt=("server"|"shared"|"client")}, _), _) ->
-      Location.raise_errorf ~loc "Sections are only allowed at toplevel."
-    | _ -> AM.default_mapper.signature_item mapper sig_
-
-  let eliom_mapper context =
-    let context = ref (context :> Context.t) in
-    { Ast_mapper.default_mapper
-      with
-        Ast_mapper.
-
-        expr = eliom_expr context ;
-
-        (* Reject sections not at toplevel. *)
-        structure_item ;
-        signature_item ;
-    }
-
-
-  (** Toplevel translation *)
-  (** Switch the current context when encountering [%%server] (resp. shared, client)
-      annotations. Call the eliom mapper and [Pass.server_str] (resp ..) on each
-      structure item.
-  *)
-
-  let dispatch_str context _mapper stri =
-    (* We must do this before any transformation on the structure. *)
-    let no_fragment = Cannot_have_fragment.structure_item stri in
-    let f = match context with
-      | `Server -> Pass.server_str no_fragment
-      | `Shared -> Pass.shared_str no_fragment
-      | `Client -> Pass.client_str
-    in
-    let m = eliom_mapper context in
-    f @@ m.AM.structure_item m stri
-
-  let dispatch_sig context _mapper sigi =
-    let f = match context with
-      | `Server -> Pass.server_sig
-      | `Shared -> Pass.shared_sig
-      | `Client -> Pass.client_sig
-    in
-    let m = eliom_mapper context in
-    f @@ m.AM.signature_item m sigi
-
-  let toplevel_structure context mapper structs =
-    let f pstr =
-      let loc = pstr.pstr_loc
-      and maybe_reset_injected_idents = function
-        | `Client | `Shared ->
-          Name.reset_injected_ident ();
-        | _ ->
-          ()
-      in
-      match pstr.pstr_desc with
-      | Pstr_extension (({txt}, PStr strs), _)
-        when is_annotation txt ["shared.start";
-                                "client.start";
-                                "server.start"] ->
-        if strs <> [] then
-          [ Str.extension ~loc @@ AM.extension_of_error @@ Location.errorf ~loc
-              "The %%%%%s extension doesn't accept arguments." txt ]
-        else (
-          maybe_reset_injected_idents !context ;
-          context := Context.of_string txt ;
-          []
-        )
-      | Pstr_extension (({txt}, PStr strs), _)
-        when is_annotation txt ["shared"; "client" ;"server"] ->
-        let c = Context.of_string txt in
-        let l = flatmap (dispatch_str c mapper) strs in
-        maybe_reset_injected_idents c ; l
-      | _ ->
-        dispatch_str !context mapper pstr
-    in
-    let loc = {(file_position structs) with loc_ghost = true} in
-    module_hash_declaration loc ::
-    Pass.prelude loc @
-    flatmap f structs @
-    Pass.postlude loc
-
-  let toplevel_signature context mapper sigs =
-    let f psig =
-      let loc = psig.psig_loc in
-      match psig.psig_desc with
-      | Psig_extension (({txt}, PStr strs), _)
-        when is_annotation txt ["shared.start"; "client.start" ;"server.start"] ->
-        if strs <> [] then
-          [ Sig.extension ~loc @@ AM.extension_of_error @@ Location.errorf ~loc
-              "The %%%%%s extension doesn't accept arguments." txt ]
-        else ( context := Context.of_string txt ; [] )
-      | _ ->
-        dispatch_sig !context mapper psig
-    in
-    flatmap f sigs
-
-  let mapper args =
-    let () = match_args args in
-    let c = ref `Server in
-    {AM.default_mapper
-     with
-      structure = toplevel_structure c ;
-      signature = toplevel_signature c ;
-    }
-
-end
diff --git a/src/ppx/ppx_eliom_utils.mli b/src/ppx/ppx_eliom_utils.mli
deleted file mode 100644
index 4b33cb5669..0000000000
--- a/src/ppx/ppx_eliom_utils.mli
+++ /dev/null
@@ -1,89 +0,0 @@
-open Parsetree
-
-(** {2 Various helping functions} *)
-
-(** Name of the variable which holds the hash of the file. *)
-val id_file_hash : Location.t -> string Location.loc
-
-val eid : string Location.loc -> expression
-
-val position : Location.t -> expression
-
-val format_args : expression list -> expression
-
-val pat_args : pattern list -> pattern
-
-(** Context convenience module. *)
-module Context : sig
-
-  type server = [ `Server | `Shared ]
-  type client = [ `Client | `Shared ]
-
-  type escape_inject = [
-    | `Escaped_value of server
-    | `Injection of client
-  ]
-
-  type t = [
-    | `Server (* [%%server ... ] *)
-    | `Client (* [%%client ... ] *)
-    | `Shared (* [%%shared  ... ] *)
-    | `Fragment of server (* [%client ... ] *)
-    | `Escaped_value of server (* [%%server [%client ~%( ... ) ] ] *)
-    | `Injection of client (* [%%client ~%( ... ) ] *)
-  ]
-end
-
-module Mli : sig
-
-  val is_escaped_ident : string -> bool
-
-  val get_injected_ident_info : string -> (string * int)
-
-  val exists : unit -> bool
-
-  val find_escaped_ident : string Location.loc -> core_type
-  val find_injected_ident : string Location.loc -> core_type
-  val find_fragment : string Location.loc -> core_type
-
-end
-
-(** Signature of specific code of a preprocessor. *)
-module type Pass = sig
-
-  (** How to handle "client", "shared" and "server" sections for top level structure items.
-
-      For shared and server, the boolean argument indicate if this
-      declaration can lead to evaluation of a fragment.
-  *)
-
-  val shared_str: bool -> structure_item -> structure_item list
-  val server_str: bool -> structure_item -> structure_item list
-  val client_str: structure_item -> structure_item list
-
-  (** How to handle "client", "shared" and "server" sections for top level signature items. *)
-
-  val shared_sig: signature_item -> signature_item list
-  val client_sig: signature_item -> signature_item list
-  val server_sig: signature_item -> signature_item list
-
-  (** How to handle "[%client ...]" and "[%shared ...]" expr. *)
-  val fragment:
-    ?typ:core_type -> context:Context.server ->
-    num:string -> id:string Location.loc ->
-    expression -> expression
-
-  (** How to handle escaped "~%ident" inside a fragment. *)
-  val escape_inject:
-    ?ident:string -> context:Context.escape_inject ->
-    id:string Location.loc ->
-    expression -> expression
-
-  val prelude : Location.t -> structure
-  val postlude : Location.t -> structure
-
-end
-
-module Make (P : Pass) : sig
-  val mapper : string list -> Ast_mapper.mapper
-end
diff --git a/src/syntax/pa_eliom_client_client.ml b/src/syntax/pa_eliom_client_client.ml
deleted file mode 100644
index ffe92cfc5e..0000000000
--- a/src/syntax/pa_eliom_client_client.ml
+++ /dev/null
@@ -1,319 +0,0 @@
-(* Ocsigen
- * http://www.ocsigen.org
- * Copyright (C) 2010-2011
- * Raphaël Proust, Grégoire Henry, Benedikt Becker
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *)
-
-(* This prepocessor generates the code to be executed by the navigator. *)
-
-(* BB {2 map_get_escaped_values / escape_inject generates only $lid:gen_id$}
-   The expression $expr$ inside a client_value will be used for for registering
-   the client closure (cf. [Client_pass.register_client_closures]), as well as
-   for creating a client-only function (cf. [Client_pass.define_client_functions]).
-   Only for the former it is necessary to call [Eliom_client_core.Syntax_helpers.get_escaped_value]
-   on the escaped identifier.
-   This is done post-hoc by [map_get_escaped_values] in [register_client_closures]. *)
-
-module Id = struct
-  let name = "client part"
-end
-
-module Client_pass(Helpers : Pa_eliom_seed.Helpers) = struct
-
-  open Helpers.Syntax
-
-  let notyp = ref false
-  let _ =
-    Camlp4.Options.add "-notype" (Arg.Set notyp) "(not documented)"
-
-  (* {2 Auxiliaries} *)
-
-  (* Replace every type [t client_value] by [t]. *)
-  let drop_client_value_ctyp =
-    let ast_mapper =
-      Ast.map_ctyp
-        (fun typ ->
-          match Helpers.is_client_value_type typ with
-            | Some typ' -> typ'
-            | None -> typ)
-    in
-    fun typ -> ast_mapper#ctyp typ
-
-  (* Replace every escaped identifier [v] with
-     [Eliom_client_core.Syntax_helpers.get_escaped_value v] *)
-  let map_get_escaped_values ?nested:(nested = false) =
-    let mapper =
-      Ast.map_expr
-        (function
-          | <:expr@_loc< $lid:str$ >>
-            when Helpers.is_escaped_indent_string str ->
-            <:expr<
-              Eliom_client_core.Syntax_helpers.get_escaped_value
-                $lid:str$ >>
-          | <:expr@_loc< $lid:str$ >>
-            when (Helpers.is_nested_escaped_indent_string str &&
-                  nested) ->
-            <:expr<
-              Eliom_client_core.Syntax_helpers.get_escaped_value
-                $lid:str$ >>
-          | expr ->
-            expr)
-    in
-    fun expr ->
-      mapper#expr expr
-
-  let push_escaped_binding, flush_escaped_bindings =
-    let server_arg_ids = ref [] in
-    let is_unknown gen_id =
-      List.for_all
-        (fun (gen_id', _) -> gen_id <> gen_id')
-        !server_arg_ids
-    in
-    let push gen_id expr =
-      if is_unknown gen_id then
-        server_arg_ids := (gen_id, expr) :: !server_arg_ids
-    in
-    let flush () =
-      let res = List.rev !server_arg_ids in
-      server_arg_ids := [];
-      res
-    in
-    push, flush
-
-  let push_escaped_binding_nested, flush_escaped_bindings_nested =
-    let server_arg_ids = ref [] in
-    let is_unknown gen_id =
-      List.for_all
-        (fun (gen_id', _) -> gen_id <> gen_id')
-        !server_arg_ids
-    in
-    let push gen_id expr =
-      if is_unknown gen_id then
-        server_arg_ids := (gen_id, expr) :: !server_arg_ids
-    and flush () =
-      let res = List.rev !server_arg_ids in
-      server_arg_ids := [];
-      res
-    in
-    push, flush
-
-  let push_client_value_data, flush_client_value_datas =
-    let client_value_datas = ref [] in
-    let push gen_num gen_id expr nested args =
-      client_value_datas :=
-        (gen_num, gen_id, expr, nested, args) :: !client_value_datas
-    in
-    let flush () =
-      let res = List.rev !client_value_datas in
-      client_value_datas := [];
-      res
-    in
-    push, flush
-
-  let get_type f x =
-    if !notyp then
-      let _loc = Loc.ghost in
-      <:ctyp< _ >>
-    else f x
-
-  let register_client_closures client_value_datas =
-    let registrations =
-      List.map
-        (fun (gen_num, _, expr, nested, args) ->
-           let typ = get_type Helpers.find_client_value_type gen_num in
-           let _loc = Ast.loc_of_expr expr in
-           <:expr<
-             Eliom_client_core.Syntax_helpers.register_client_closure
-               $str:gen_num$
-               (fun $Helpers.patt_tuple args$ ->
-                  ($map_get_escaped_values ~nested expr$ : $typ$))
-           >>)
-        client_value_datas
-    in
-    let _loc = Loc.ghost in
-    <:str_item< let () = $Ast.exSem_of_list registrations$; () >>
-
-  let define_client_functions client_value_datas =
-    let bindings =
-      List.map
-        (fun (gen_num, gen_id, expr, _, args) ->
-           let patt =
-             let _loc = Loc.ghost in
-             <:patt< $lid:gen_id$ >>
-           in
-           let typ = get_type Helpers.find_client_value_type gen_num in
-           let expr =
-             let _loc = Loc.ghost in
-             <:expr<
-               fun $Helpers.patt_tuple args$ ->
-                 ($expr$ : $typ$)
-             >>
-           in
-           patt, expr)
-        client_value_datas
-    in
-    let _loc = Loc.ghost in
-    <:str_item< let $Ast.binding_of_pel bindings$ >>
-
-  (* For injections *)
-
-  let close_server_section loc =
-    let _loc = Loc.ghost in
-    <:str_item<
-        let () =
-          Eliom_client_core.Syntax_helpers.close_server_section
-            $str:Helpers.file_hash loc$
-    >>
-
-  let open_client_section loc =
-    let _loc = Loc.ghost in
-    <:str_item<
-        let () =
-          Eliom_client_core.Syntax_helpers.open_client_section
-            $str:Helpers.file_hash loc$
-    >>
-
-  (** Syntax extension *)
-
-  let client_str_items loc items =
-    Ast.stSem_of_list
-      (open_client_section loc ::
-       items)
-
-  let server_str_items loc _ =
-    Ast.stSem_of_list
-      [ register_client_closures (flush_client_value_datas ());
-        close_server_section loc; ]
-
-  let shared_str_items loc items =
-    let client_expr_data = flush_client_value_datas () in
-    Ast.stSem_of_list
-      (open_client_section loc ::
-       register_client_closures client_expr_data ::
-       define_client_functions client_expr_data ::
-       items @
-       [ close_server_section loc ])
-
-  let client_value_expr typ context_level orig_expr gen_num gen_id loc =
-
-    match context_level with
-      | `Server ->
-          let l = flush_escaped_bindings () in
-          push_client_value_data gen_num gen_id orig_expr false
-            (List.map fst l);
-          <:expr@loc< >>
-      | `Shared_expr _ ->
-          let l = flush_escaped_bindings_nested () in
-          push_client_value_data gen_num gen_id orig_expr true
-            (List.map fst l);
-          (* Escaped bindings can only refer to the parent client
-             context. To allow IDs that refer to the outer context, we
-             would need to determine whether an ID should be injected
-             by the server or not. This would require knowledge of
-             variable scopes. *)
-          let bindings =
-            List.map
-              (fun (gen_id, expr) ->
-                 let _loc = Loc.ghost in
-                 <:patt< $lid:gen_id$ >>, expr)
-              l
-          in
-          <:expr@loc<
-            let $Ast.binding_of_pel bindings$ in
-            $orig_expr$ >>
-      | `Shared ->
-          let l = flush_escaped_bindings () in
-          push_client_value_data gen_num gen_id orig_expr false
-            (List.map fst l);
-          let bindings =
-            List.map
-              (fun (gen_id, expr) ->
-                 let _loc = Loc.ghost in
-                 <:patt< $lid:gen_id$ >>, expr)
-              l
-          in
-          let args =
-            let _loc = Loc.ghost in
-            Helpers.expr_tuple
-              (List.map
-                 (fun (gen_id, _) ->
-                    <:expr< $lid:gen_id$ >>)
-                 l)
-          in
-          <:expr@loc<
-            let $Ast.binding_of_pel bindings$ in
-            $lid:gen_id$ $args$
-          >> ;;
-
-  let shared_value_expr = client_value_expr
-
-  let escape_inject context_level ?ident orig_expr gen_id =
-    let open Pa_eliom_seed in
-    let _loc = Ast.loc_of_expr orig_expr in
-    let assert_no_variables typ =
-      let f = function
-        | Ast.TyQuo _ as typ ->
-            Printf.eprintf
-              "%s: %s\n"
-              (Loc.to_string _loc)
-              ": Warning. The type of an injected value contains a type variable that could be wrongly inferred (to be fixed in Eliom).";
-            typ
-        | typ -> typ
-      in
-      ignore ((Ast.map_ctyp f)#ctyp typ)
-    in
-    match context_level with
-      | Escaped_in_client_value_in (`Shared_expr _) ->
-          (* {section{ ... {shared#{ ... {{ ... }} ... }} ... }} *)
-          push_escaped_binding_nested gen_id orig_expr;
-          <:expr< $lid:gen_id$ >>
-      | Escaped_in_client_value_in _
-      | Escaped_in_shared_value_in _ ->
-          (* {section{ ... {{ ... %x ... }} ... }} or
-             {section{ ... {shared# ... { ... %x ... }} ... }} *)
-          let typ =
-            drop_client_value_ctyp
-              (get_type Helpers.find_escaped_ident_type gen_id)
-          in
-          assert_no_variables typ;
-          push_escaped_binding gen_id orig_expr;
-          <:expr< ($lid:gen_id$ : $typ$) >>
-      | Injected_in _section ->
-          (* {_section{ ... %x ... }} *)
-          let typ =
-            drop_client_value_ctyp
-              (get_type Helpers.find_injected_ident_type gen_id)
-          in
-          assert_no_variables typ;
-          let ident = match ident with
-            | None -> <:expr<None>>
-            | Some i -> <:expr<Some $str:i$>> in
-          let (u, d) = Helpers.get_injected_ident_info gen_id in
-          let s = Printf.sprintf "%s%d" u d in
-          <:expr<
-            (Eliom_client_core.Syntax_helpers.get_injection ?ident:($ident$) ~pos:($Helpers.position _loc$) $str:s$ : $typ$)
-          >>
-
-  let implem _ sil = sil
-
-  let shared_sig_items _ items = Ast.sgSem_of_list items
-  let server_sig_items _ items = Ast.sgSem_of_list []
-  let client_sig_items _ items = Ast.sgSem_of_list items
-
-end
-
-module M = Pa_eliom_seed.Register(Id)(Client_pass)
diff --git a/src/syntax/pa_eliom_client_server.ml b/src/syntax/pa_eliom_client_server.ml
deleted file mode 100644
index 3e8c6b581f..0000000000
--- a/src/syntax/pa_eliom_client_server.ml
+++ /dev/null
@@ -1,264 +0,0 @@
-(* Ocsigen
- * http://www.ocsigen.org
- * Copyright (C) 2010-2011
- * Raphaël Proust, Grégoire Henry
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *)
-
-(* This prepocessor generates the module to be loaded by Ocsigen server *)
-
-module Id = struct
-  let name = "server part"
-end
-
-module Server_pass(Helpers : Pa_eliom_seed.Helpers) = struct
-
-  open Helpers.Syntax
-
-  let notyp = ref false
-  let _ =
-    Camlp4.Options.add "-notype" (Arg.Set notyp) "(not documented)"
-
-  let push_escaped_binding, flush_escaped_bindings =
-    let arg_ids = ref [] in
-    let arg_collection = ref [] in
-    let push orig_expr gen_id =
-      if not (List.mem gen_id !arg_ids) then begin
-        let _loc = Ast.loc_of_expr orig_expr in
-        arg_collection := (gen_id, orig_expr) :: !arg_collection;
-        arg_ids := gen_id :: !arg_ids
-      end
-    in
-    let flush () =
-      let res = List.rev !arg_collection in
-      arg_ids := [];
-      arg_collection := [];
-      let aux (_, arg) =
-        let _loc = Ast.loc_of_expr arg in
-        <:expr< Eliom_syntax.escaped_value $arg$ >>
-      in
-      List.map aux res
-    in
-    push, flush
-
-  let push_escaped_binding_nested,
-      flush_escaped_bindings_nested =
-    let arg_ids = ref [] in
-    let arg_collection = ref [] in
-    let push orig_expr gen_id =
-      if not (List.mem gen_id !arg_ids) then begin
-        arg_collection := (gen_id, orig_expr) :: !arg_collection;
-        arg_ids := gen_id :: !arg_ids
-      end
-    and flush () =
-      let res = List.rev !arg_collection
-      and aux (_, arg) =
-        let _loc = Ast.loc_of_expr arg in
-        <:expr< Eliom_syntax.escaped_value $arg$ >>
-      in
-      arg_ids := [];
-      arg_collection := [];
-      List.map aux res
-    in
-    push, flush
-
-  let push_injection, flush_injections =
-    let module String_set = Set.Make (String) in
-    let buffer : (_ * _ * _) list ref = ref [] in
-    let gen_ids = ref String_set.empty in
-    let push ?ident gen_id orig_expr =
-      if not (String_set.mem gen_id !gen_ids) then
-        (gen_ids := String_set.add gen_id !gen_ids;
-         buffer := (gen_id, orig_expr,ident) :: !buffer)
-    in
-    let flush_all () =
-      let res = List.rev !buffer in
-      gen_ids := String_set.empty;
-      buffer := [];
-      res
-    in
-    let global_known = ref String_set.empty in
-    let flush () =
-      let all = flush_all () in
-      let novel =
-        let is_fresh (gen_id, _,_) =
-          not (String_set.mem gen_id !global_known)
-        in
-        List.filter is_fresh all
-      in
-      List.iter
-        (function gen_id, _, _ ->
-           global_known := String_set.add gen_id !global_known)
-        novel;
-      all
-    in
-    push, flush
-
-  (* For every injection of $orig_expr$ as $gen_id$:
-     let $gen_id$ = $orig_expr$ and ...
-     (Necessary for injections in shared section) *)
-  let bind_injected_idents injections =
-    let _loc = Loc.ghost in
-    let bindings =
-      List.map
-        (fun (gen_id, orig_expr,_) ->
-           <:patt< $lid:gen_id$ >>,
-           orig_expr)
-        injections
-    in
-    <:str_item< let $Ast.binding_of_pel bindings$ >>
-
-  let close_server_section loc =
-    let _loc = Loc.ghost in
-    <:str_item<
-        let () =
-          Eliom_syntax.close_server_section
-            $str:Helpers.file_hash loc$
-    >>
-
-  let close_client_section loc injections =
-    let _loc = Loc.ghost in
-    let injection_list =
-      List.fold_right
-        (fun (gen_id, expr, ident) sofar ->
-           let loc1 = Ast.loc_of_expr expr in
-           let loc1_expr = Helpers.position loc1 in
-           let ident = match ident with
-             | None -> <:expr<None>>
-             | Some i -> <:expr< Some $str:i$>> in
-           let num =
-             string_of_int (snd (Helpers.get_injected_ident_info gen_id)) in
-           <:expr< ($int:num$, Eliom_lib.to_poly $lid:gen_id$,
-                    $loc1_expr$, $ident$) :: $sofar$ >>)
-        injections <:expr< [] >>
-    in
-    <:str_item<
-        let () =
-          Eliom_syntax.close_client_section
-            $str:Helpers.file_hash loc$
-            $injection_list$
-    >>
-
-
-  (** Syntax extension *)
-
-  let client_str_items loc _ =
-    let all_injections = flush_injections () in
-    Ast.stSem_of_list
-      [bind_injected_idents all_injections;
-       close_client_section loc all_injections]
-
-  let server_str_items loc items =
-    Ast.stSem_of_list
-      (items @
-       [ close_server_section loc ])
-
-  let shared_str_items loc items =
-    let all_injections = flush_injections () in
-    Ast.stSem_of_list
-      (bind_injected_idents all_injections ::
-       items @
-       [ close_server_section loc;
-         close_client_section loc all_injections ])
-
-  let client_value_expr typ context_level orig_expr gen_id _ loc =
-    let typ =
-      match typ with
-      | Some typ -> typ
-      | None ->
-        if !notyp then
-          let _loc = Loc.ghost in <:ctyp< _ >>
-        else
-          match Helpers.find_client_value_type gen_id with
-          | Ast.TyQuo _ ->
-            Helpers.raise_syntax_error loc
-              "The types of client values must be monomorphic from its usage \
-               or from its type annotation"
-          | typ -> typ
-    in
-    let _loc = Ast.loc_of_expr orig_expr
-    and l =
-      match context_level with
-      | `Shared_expr _ ->
-        flush_escaped_bindings_nested ()
-      | _ ->
-        flush_escaped_bindings ()
-    in
-    <:expr@loc<
-      (Eliom_syntax.client_value
-         ~pos:($Helpers.position _loc$)
-         $str:gen_id$ $Helpers.expr_tuple l$
-       : $typ$ Eliom_client_value.t) >> ;;
-
-  let shared_value_expr typ _ orig_expr gen_id _ loc =
-    let typ =
-      match typ with
-      | Some typ -> typ
-      | None ->
-        if !notyp then
-          let _loc = Loc.ghost in <:ctyp< _ >>
-        else
-          match Helpers.find_client_value_type gen_id with
-          | Ast.TyQuo _ ->
-            Helpers.raise_syntax_error loc
-              "The types of shared values must be monomorphic from its usage \
-               or from its type annotation"
-          | typ -> typ
-    in
-    let _loc = Ast.loc_of_expr orig_expr in
-    <:expr@loc<
-    Eliom_shared.Value.create
-      $orig_expr$
-      (Eliom_syntax.client_value
-        ~pos:($Helpers.position _loc$)
-        $str:gen_id$
-        $Helpers.expr_tuple (flush_escaped_bindings ())$
-      : $typ$ Eliom_client_value.t)
-    >>
-
-  let escape_inject context_level ?ident orig_expr gen_id =
-    let open Pa_eliom_seed in
-    match context_level with
-      | Escaped_in_client_value_in (`Shared_expr _) ->
-          push_escaped_binding_nested orig_expr gen_id;
-          let _loc = Loc.ghost in
-          <:expr< >>
-      | Escaped_in_shared_value_in _ ->
-          push_escaped_binding orig_expr gen_id;
-          orig_expr
-      | Escaped_in_client_value_in _ ->
-          push_escaped_binding orig_expr gen_id;
-          let _loc = Loc.ghost in
-          <:expr< >>
-      | Injected_in _ ->
-          push_injection ?ident gen_id orig_expr;
-          let _loc = Ast.loc_of_expr orig_expr in
-          <:expr< $lid:gen_id$ >>
-
-  let implem loc sil =
-    let _loc = Loc.ghost in
-    let set_global b =
-      <:str_item< let () = Eliom_syntax.set_global $`bool:b$ >>
-    in
-    set_global true :: sil @ [ set_global false ]
-
-  let shared_sig_items _ items = Ast.sgSem_of_list items
-  let server_sig_items _ items = Ast.sgSem_of_list items
-  let client_sig_items _ items = Ast.sgSem_of_list []
-
-end
-
-module M = Pa_eliom_seed.Register(Id)(Server_pass)
diff --git a/src/syntax/pa_eliom_seed.ml b/src/syntax/pa_eliom_seed.ml
deleted file mode 100644
index 6c8a222a63..0000000000
--- a/src/syntax/pa_eliom_seed.ml
+++ /dev/null
@@ -1,963 +0,0 @@
-(* Ocsigen
- * http://www.ocsigen.org
- * Copyright (C) 2010-2011
- * Raphaël Proust, Grégoire Henry
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *)
-
-(* Eliom's syntax extension implements five kinds of quotations:
-
-    - a toplevel structure item "{client{ ... }}" for client side code ;
-    - a toplevel structure item "{server{ ... }}" (optional) for server side code ;
-    - a toplevel structure item "{shared{ ... }}" for code that will be used
-      both for the server and the client ;
-    - an expression "{{ ... }}" for client side code inside server side expressions ;
-    - an expression "{shared# ... { ... }}" for shared code inside
-      server side expressions ;
-    - an escaped expression "%ident" for referencing server value from
-      client side code expressions.
-
-
-   == Compilation of Eliom source generates:
-
-     - a .cmo (or a .cmx) to be loaded by the ocsigen server ;
-     - a .js to be executed by the client.
-
-     The {client{... }} sections are ignored on the server side.
-     The {server{... }} sections are ignored on the client side.
-
-     '{{ ... }}' are compiled on the client as a function
-     parameterized by the values of escaped expressions. On the
-     server-side, '{{ ... }}' are compiled as a distant call.  To keep
-     the link, each '{{ ... }}' is associated unique string (see
-     gen_closure_id).
-
-     In order to type-check escaped-value with the same type on both
-     sides, compilation of Eliom sources infers the static type of
-     escaped values on the server-side and adds static type constraint
-     on the client-side. Inferred types also permits to specialize
-     marshaling (on the server-side) and unmarshalling (on the
-     client-side) of escaped values.
-
-   == Compilation of Eliom is implemented in three steps:
-
-     a) infers types of escaped values on the server-side code
-     b) generate the source file for the server-side
-     c) generate the source file for the client-side
-
-     Each compilation step is based an a specific preprocessor:
-
-     a) pa_eliom_type_inference
-     b) pa_eliom_client_server
-     c) pa_eliom_client_client
-
-   This module define code shared by the three preprocessors.
-
-*)
-
-(** Helpers for pa_eliom_client_server and pa_eliom_client_client. *)
-
-module type Helpers  = sig
-
-  module Syntax : Camlp4.Sig.Camlp4Syntax
-  open Syntax
-
-  (** find inferred type for escaped expr *)
-  val find_client_value_type: string -> Ast.ctyp
-
-  (** find inferred type for escaped expr *)
-  val find_escaped_ident_type: string -> Ast.ctyp
-
-  (** find inferred type for injected ident *)
-  val find_injected_ident_type: string -> Ast.ctyp
-
-  val get_injected_ident_info: string -> string * int
-
-  val is_client_value_type : Ast.ctyp -> Ast.ctyp option
-
-  val raise_syntax_error : Ast.Loc.t -> string -> _
-
-  val is_escaped_indent_string: string -> bool
-
-  val is_nested_escaped_indent_string: string -> bool
-
-  val patt_tuple : string list -> Ast.patt
-  val expr_tuple : Ast.expr list -> Ast.expr
-
-  val string_of_ident : Ast.ident -> string option
-  val position : Ast.Loc.t -> Ast.expr
-
-  val file_hash : Ast.Loc.t -> string
-end
-
-type shared_value_context = [ `Server | `Shared ]
-let shared_value_context_to_string = function
-  | `Server -> "server"
-  | `Shared -> "shared"
-
-type client_value_context =
-  [ `Server
-  | `Shared
-  | `Shared_expr of shared_value_context ]
-let client_value_context_to_string = function
-  | `Server -> "server"
-  | `Shared -> "shared"
-  | `Shared_expr c ->
-    "shared expr on " ^ (shared_value_context_to_string c)
-
-type injection_context = [ `Client | `Shared ]
-let injection_context_to_string = function
-  | `Client -> "client"
-  | `Shared -> "shared"
-
-type escape_inject =
-  | Escaped_in_client_value_in of client_value_context
-  | Escaped_in_shared_value_in of shared_value_context
-  | Injected_in of injection_context
-
-(** Signature of specific code of a preprocessor. *)
-
-module type Pass = functor (Helpers: Helpers) -> sig
-
-  open Helpers.Syntax
-
-  (** How to handle "{shared{ ... }}" str_item. *)
-  val shared_str_items: Ast.Loc.t -> Ast.str_item list -> Ast.str_item
-
-  (** How to handle "{server{ ... }}" str_item and toplevel str_item. *)
-  val server_str_items: Ast.Loc.t -> Ast.str_item list -> Ast.str_item
-
-  (** How to handle "{client{ ... }}" str_item. *)
-  val client_str_items: Ast.Loc.t -> Ast.str_item list -> Ast.str_item
-
-  val shared_sig_items: Ast.Loc.t -> Ast.sig_item list -> Ast.sig_item
-  val client_sig_items: Ast.Loc.t -> Ast.sig_item list -> Ast.sig_item
-  val server_sig_items: Ast.Loc.t -> Ast.sig_item list -> Ast.sig_item
-
-  (** How to handle "{{ ... }}" expr. *)
-  val client_value_expr: Ast.ctyp option -> client_value_context -> Ast.expr -> string -> string -> Ast.Loc.t -> Ast.expr
-
-  (** How to handle "{shared# ... { ... }}" expr. *)
-  val shared_value_expr:
-    Ast.ctyp option -> shared_value_context -> Ast.expr ->
-    string -> string -> Ast.Loc.t -> Ast.expr
-
-  (** How to handle escaped "%ident" inside "{{ ... }}". *)
-  val escape_inject: escape_inject -> ?ident: string -> Ast.expr -> string -> Ast.expr
-
-  val implem : Ast.Loc.t -> Ast.str_item list -> Ast.str_item list
-
-end
-
-let fst_3 (x, _, _) = x
-let snd_3 (_, x, _) = x
-let trd_3 (_, _, x) = x
-
-module Register(Id : sig val name: string end)(Pass : Pass) = struct
-
-  module Make(Syntax : Camlp4.Sig.Camlp4Syntax) = struct
-
-    include Syntax
-
-    (* Syntax error exception *)
-    module Syntax_error = struct
-      type t = string
-      exception E of t
-      let print fmt msg =
-        Format.fprintf fmt "Error: %s" msg
-      let to_string msg =
-        ignore(Format.flush_str_formatter ());
-        print Format.str_formatter msg;
-        Format.flush_str_formatter ()
-      let raise _loc msg =
-        Loc.raise _loc (E msg)
-    end
-
-    module Helpers = struct
-
-      (* Anything easier than Camlp4? Create a parser for OCaml which
-         shares the Token, AST, etc with those of the [Syntax]
-         argument in the above functor [Make], but with an independent
-         Grammar, because we want the to parse the .type_mli without
-         the grammar modifications in made for the .eliomi files. *)
-      module Syntax =
-        Camlp4OCamlParser.Make
-          (Camlp4OCamlRevisedParser.Make
-             (Camlp4.OCamlInitSyntax.Make
-                (Syntax.Ast)
-                (Camlp4.Struct.Grammar.Static.Make
-                   (Camlp4.Struct.Lexer.Make (Syntax.Token)))
-                (Syntax.Quotation)))
-
-      let raise_syntax_error _loc msg =
-        Syntax_error.raise _loc msg
-
-      (** MLI READER ***)
-
-      (* Here we define a set of functions for mli reading. This is used
-         to peek at the type inferred by the first pass.*)
-
-      let type_file = ref ""
-      let _ =
-        Camlp4.Options.add "-type" (Arg.Set_string type_file) "type inference file"
-
-      let get_type_file () = match !type_file with
-        | "" -> Filename.chop_extension !Camlp4_config.current_input_file
-                ^ ".type_mli"
-        | f -> f
-
-      let suppress_underscore =
-        let c = ref 0 in
-        let uid () = incr c ; !c in
-        fun ty ->
-          let pfix = Printf.sprintf "__eliom_inferred_type_%d" (uid ()) in
-           let map ty = match ty with
-             | Ast.TyApp (_, Ast.TyAny _, ty)
-             | Ast.TyApp (_, ty, Ast.TyAny _) -> ty
-             | Ast.TyQuo (x, var) when var.[0] = '_' ->
-               Ast.TyQuo (x, (String.sub var 1 (String.length var - 1)) ^ pfix)
-             | ty -> ty in
-          (Ast.map_ctyp map)#ctyp ty
-
-      let rec string_of_ident =
-        function
-        | <:ident< $lid:s$ >> -> Some s
-        | <:ident< $uid:s$ >> -> Some s
-        | <:ident< $i1$.$i2$ >> ->
-          begin match (string_of_ident i1), (string_of_ident i2) with
-            | Some s1,Some s2 -> Some (s1 ^ "." ^ s2)
-            | _ -> None end
-        | _ -> None
-
-      let lexing_position l =
-        let _loc = Loc.ghost in
-        <:expr<
-          { Lexing.pos_fname = $str:l.Lexing.pos_fname$;
-            Lexing.pos_lnum = $int:string_of_int l.Lexing.pos_lnum$;
-            Lexing.pos_bol = $int:string_of_int l.Lexing.pos_bol$;
-            Lexing.pos_cnum = $int:string_of_int l.Lexing.pos_cnum$; }>>
-
-      let position _loc =
-        let start = Loc.start_pos _loc in
-        let stop = Loc.stop_pos _loc in
-        <:expr< ($lexing_position start$ , $lexing_position stop$) >>
-
-      let escaped_ident_prefix = "__eliom__escaped_ident__reserved_name__"
-      let escaped_ident_prefix_len = String.length escaped_ident_prefix
-      let is_escaped_indent_string id =
-        String.length id > escaped_ident_prefix_len &&
-        String.sub id 0 escaped_ident_prefix_len = escaped_ident_prefix
-      let is_escaped_ident = function
-          (* | <:sig_item< val $id$ : $t$ >> -> *)
-        | Ast.SgVal (_loc, id, t) ->
-            is_escaped_indent_string id
-        | si -> false
-
-      (* separate set of IDs for client values inside shared values *)
-      let nested_escaped_ident_prefix = "__eliom__cv_in_sv__reserved_name__"
-      let nested_escaped_ident_prefix_len =
-        String.length nested_escaped_ident_prefix
-      let is_nested_escaped_indent_string id =
-        String.length id > nested_escaped_ident_prefix_len &&
-        String.sub id 0 nested_escaped_ident_prefix_len =
-        nested_escaped_ident_prefix
-
-      let injected_ident_fmt () =
-        format_of_string "__eliom__injected_ident__reserved_name__%6s__%d"
-      let is_injected_ident = function
-          (* | <:sig_item< val $id$ : $t$ >> -> *)
-        | Ast.SgVal (_loc, id, t) ->
-            (try
-               Scanf.sscanf id (injected_ident_fmt ()) (fun _ _ -> true)
-             with Scanf.Scan_failure _ ->
-               false)
-        | si -> false
-
-      let client_value_ident_prefix = "__eliom__client_value__reserved_name__"
-      let client_value_ident_prefix_len = String.length client_value_ident_prefix
-      let is_client_value_ident = function
-          (* | <:sig_item< val $id$ : $t$ >> -> *)
-        | Ast.SgVal (_loc, id, t) ->
-            String.length id > client_value_ident_prefix_len &&
-            String.sub id 0 client_value_ident_prefix_len = client_value_ident_prefix
-        | si -> false
-
-      let is_client_value_type = function
-        | <:ctyp< $typ$ Eliom_client_value.t >> -> Some typ
-        | _ -> None
-
-      let extract_escaped_ident_type = function
-          (* | <:sig_item< val $id$ : ($t$ option ref) >> -> *)
-        | Ast.SgVal (_loc, id, <:ctyp< ($t$ option ref) >>) ->
-            let len = String.length id - escaped_ident_prefix_len in
-            int_of_string (String.sub id escaped_ident_prefix_len len),
-            suppress_underscore t
-        | _ -> failwith "extract_escaped_ident_type"
-      let extract_injected_ident_type = function
-          (* | <:sig_item< val $id$ : ($t$ option ref) >> -> *)
-        | Ast.SgVal (_loc, id, <:ctyp< ($t$ option ref) >>) ->
-            Scanf.sscanf id (injected_ident_fmt ()) (fun _filehash n -> n),
-            suppress_underscore t
-        | _ -> failwith "extract_injected_ident_type"
-      let extract_client_value_type = function
-          (* | <:sig_item< val $id$ : ($t$ option ref) >> -> *)
-        | Ast.SgVal (_, id, <:ctyp< $typ$ option ref>>) ->
-            (match is_client_value_type typ with
-              | Some t ->
-                let len = String.length id - client_value_ident_prefix_len in
-                String.sub id client_value_ident_prefix_len len,
-                suppress_underscore t
-              | None ->
-                  Printf.ksprintf failwith
-                    "extract_client_value_type: Not a client value %S" id)
-        | _ -> failwith "extract_client_value_type"
-
-      let load_file f =
-        try
-          let ic = open_in f in
-          let s = Stream.of_channel ic in
-          let item = Syntax.parse_interf (Loc.mk f) s in
-          let items = Ast.list_of_sig_item item [] in
-          close_in ic;
-          List.map extract_escaped_ident_type (List.filter is_escaped_ident items),
-          List.map extract_injected_ident_type (List.filter is_injected_ident items),
-          List.map extract_client_value_type (List.filter is_client_value_ident items)
-        with
-          | Sys_error _ ->
-            Printf.eprintf "Error: File type not found (%s)\n" (get_type_file ());
-            exit 1
-          | Loc.Exc_located(loc,exn) ->
-            Printf.eprintf "%s:\n Exception (%s)\n"
-              (Loc.to_string loc) (Printexc.to_string exn);
-            exit 1
-
-      let inferred_sig = lazy (load_file (get_type_file ()))
-
-      let find_escaped_ident_type id =
-        try
-          let len = String.length id - escaped_ident_prefix_len in
-          let id = int_of_string (String.sub id escaped_ident_prefix_len len) in
-          List.assoc id (fst_3 (Lazy.force inferred_sig))
-        with Not_found ->
-          Printf.eprintf "Error: Infered type of escaped ident not found (%s). \
-                          You need to regenerate %s.\n"
-            id (get_type_file ());
-          exit 1
-
-      let get_injected_ident_info id =
-        Scanf.sscanf id (injected_ident_fmt ()) (fun u n -> (u, n))
-
-      let find_injected_ident_type id =
-        try
-          let (_, id) = get_injected_ident_info id in
-          List.assoc id (snd_3 (Lazy.force inferred_sig))
-        with Not_found ->
-          Printf.eprintf "Error: Infered type of injected ident not found (%s). \
-                          You need to regenerate %s.\n"
-            id (get_type_file ());
-          exit 1
-
-      let find_client_value_type id =
-        try
-          List.assoc id (trd_3 (Lazy.force inferred_sig))
-        with Not_found ->
-          Printf.eprintf "Error: Infered type client value not found (%s). \
-                          You need to regenerate %s.\n"
-            id (get_type_file ());
-          exit 1
-
-      (* Convert a list of patterns to a tuple of pattern, one single pattern, or (). *)
-      let patt_tuple =
-        let _loc = Loc.ghost in
-        let patt_of_id id =
-          <:patt< $lid:id$ >>
-        in function
-        | [] -> <:patt< () >>
-        | [id] -> patt_of_id id
-        | ps -> <:patt< $tup:Ast.paCom_of_list (List.map patt_of_id ps)$ >>
-
-      (* Convert a list of expressions to a tuple, one expression, or (). *)
-      let expr_tuple =
-        let _loc = Loc.ghost in function
-        | [] -> <:expr< () >>
-        | [e] -> e
-        | es -> <:expr< $tup:Ast.exCom_of_list es$ >>
-
-      let file_hash loc =
-        let s = Digest.string (Ast.Loc.file_name loc) in
-        let e =
-          "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_'" in
-        let o = Bytes.create 6 in
-        let g p = Char.code s.[p] in
-        for i = 0 to 5 do
-          let p = i * 6 / 8 in
-          let d = 10 - (i * 6) mod 8 in
-          Bytes.set o i e.[(g p lsl 8 + g (p + 1)) lsr d land 63]
-        done;
-        Bytes.to_string o
-
-    end (* End of Helpers *)
-
-
-
-    (** Extend LEXER ***)
-
-    (* Add keywords: "{{", "{shared{", "{server{", "{client{" et "}}" *)
-
-    let merge_locs l ls = List.fold_left Token.Loc.merge ls l
-
-    open Camlp4.Sig (* for KEYWORD, LIDENT and SYMBOL *)
-
-    let rec filter = parser
-      | [< '(KEYWORD "{", loc0); next >] ->
-          (match next with parser
-          | [< '(KEYWORD "{", loc1); nnext >] -> (* {{ *)
-              [< '(KEYWORD "{{", merge_locs [loc0] loc1); filter nnext >]
-
-          | [< '(LIDENT "shared", loc1); nnnext >] ->
-              (match nnnext with parser
-              | [< '(KEYWORD "#", loc2); nnnnext >] -> (* {shared# *)
-                  [< '(KEYWORD ("{shared#"), merge_locs [loc0; loc1] loc2);
-                     filter nnnnext
-                       >]
-
-              | [< '(KEYWORD "{", loc2); nnnnext >] -> (* {shared{ *)
-                  [< '(KEYWORD ("{shared{"), merge_locs [loc0; loc1] loc2);
-                     filter nnnnext
-                       >]
-
-              | [< 'other; nnnnext >] -> (* back *)
-                [< '(KEYWORD "{", loc0); '(LIDENT "shared", loc1); 'other;
-                     filter nnnnext
-                       >]
-              )
-
-          | [< '(LIDENT ("client"|"server" as s), loc1); nnnext >] ->
-              (match nnnext with parser
-              | [< '(KEYWORD "{", loc2); nnnnext >] -> (* {smthg{ *)
-                  [< '(KEYWORD ("{"^s^"{"), merge_locs [loc0; loc1] loc2);
-                     filter nnnnext
-                       >]
-
-              | [< 'other; nnnnext >] -> (* back *)
-                  [< '(KEYWORD "{", loc0); '(LIDENT s, loc1); 'other;
-                     filter nnnnext
-                       >]
-              )
-
-          | [< 'other; nnext >] -> (* back *)
-              [< '(KEYWORD "{", loc0); 'other; filter nnext >]
-          )
-
-      | [< '(KEYWORD "}", loc0); next >] ->
-          (match next with parser
-          | [< '(KEYWORD "}", loc1); nnext >] ->
-              [< '(KEYWORD "}}", merge_locs [loc0] loc1); filter nnext >]
-
-          | [< 'other; nnext >] -> (* back *)
-              [< '(KEYWORD "}", loc0); 'other; filter nnext >]
-          )
-
-      | [< 'other; next >] ->
-          let is_left_delimitor str = List.mem str.[0] ['('; '['; '{'] in
-          let ends_with_percent_sign str = str.[String.length str-1] = '%' in
-          match other with
-            | (* Allow %-sign to for injection directly after left delimitors *)
-              SYMBOL str, loc0
-              when String.length str > 0 &&
-                   is_left_delimitor str &&
-                   ends_with_percent_sign str ->
-                let left = String.sub str 0 (String.length str - 1) in
-                let loc_left = Loc.move `stop (-1) loc0 in
-                let loc_right = Loc.move `start (String.length str - 1) loc0 in
-                [< '(KEYWORD left, loc_left); '(SYMBOL "%", loc_right); filter next >]
-            | _ -> [< 'other; filter next >]
-
-    let () =
-      Token.Filter.define_filter
-        (Gram.get_filter ())
-        (fun old_filter stream -> old_filter (filter stream))
-
-
-
-    (** Extend Parser **)
-
-    module Pass = Pass(Helpers)
-
-    (* State of the parser: for checking syntax imbrication. *)
-    type parsing_level =
-      | Toplevel
-      | Toplevel_module_expr
-      | Server_item
-      | Client_item
-      | Shared_item
-      | Module_expr
-      | Hole_expr of client_value_context
-      | Shared_expr of shared_value_context
-      | Escaped_expr of client_value_context
-      | Escaped_expr_in_shared of shared_value_context
-      | Injected_expr of injection_context
-    let level_to_string = function
-      | Toplevel -> "toplevel"
-      | Toplevel_module_expr -> "toplevel module expr"
-      | Server_item -> "server section"
-      | Client_item -> "client section"
-      | Shared_item -> "shared section"
-      | Module_expr -> "module expr"
-      | Shared_expr c ->
-        "shared expr in" ^ (shared_value_context_to_string c)
-      | Hole_expr client_value_context ->
-          "client value expr in " ^ client_value_context_to_string client_value_context
-      | Escaped_expr client_value_context ->
-          "escaped expression in " ^ client_value_context_to_string client_value_context
-      | Escaped_expr_in_shared shared_value_context ->
-          "escaped expression inside shared expression in " ^
-          shared_value_context_to_string shared_value_context
-      | Injected_expr injection_context ->
-          "injected expression in " ^ injection_context_to_string injection_context
-    (* [client_value_context] captures where [client_value_expr]s are allowed. *)
-    let client_value_context = function
-      | Server_item | Toplevel | Toplevel_module_expr -> `Server
-      | Shared_item -> `Shared
-      | Shared_expr c -> `Shared_expr c
-      | Client_item | Hole_expr _ | Escaped_expr _
-      | Escaped_expr_in_shared _ | Injected_expr _
-      | Module_expr as context ->
-          failwith ("client_value_context: " ^ level_to_string context)
-    let injection_context_to_parsing_level : injection_context -> parsing_level = function
-      | `Client -> Client_item
-      | `Shared -> Shared_item
-    let current_level = ref Toplevel
-    let set_current_level level =
-      current_level := level
-
-    (* [shared_value_context] captures where [shared_value_expr]s are allowed. *)
-    let shared_value_context = function
-      | Server_item | Toplevel | Toplevel_module_expr -> `Server
-      | Shared_item -> `Shared
-      | Client_item | Hole_expr _ | Shared_expr _ | Escaped_expr _
-      | Escaped_expr_in_shared _ | Injected_expr _
-      | Module_expr as context ->
-          failwith ("shared_value_context: " ^ level_to_string context)
-
-    (* Identifiers for the closure representing "Hole_expr". *)
-    let gen_closure_num_count = ref 0
-    let gen_closure_id _loc =
-      incr gen_closure_num_count;
-      Format.sprintf "%s%d" (Helpers.file_hash _loc) !gen_closure_num_count
-    let gen_closure_escaped_ident id =
-      Helpers.client_value_ident_prefix ^ id
-
-    (* Globaly unique ident for escaped expression *)
-    (* It's used for type inference and as argument name for the
-       closure representing the surrounding "Hole_expr". *)
-    (* Inside a "Hole_expr", same ident share the global ident. *)
-    let escaped_idents = ref []
-    let reset_escaped_ident () = escaped_idents := []
-    let gen_escaped_expr_ident, gen_escaped_ident =
-      let r = ref 0 in
-      (fun () ->
-        incr r;
-        Helpers.escaped_ident_prefix ^ string_of_int !r),
-      (fun id ->
-        let id = (Ast.map_loc (fun _ -> Loc.ghost))#ident id in
-        try List.assoc id !escaped_idents
-        with Not_found ->
-          incr r; let gen_id = Helpers.escaped_ident_prefix ^ string_of_int !r in
-          escaped_idents := (id, gen_id) :: !escaped_idents;
-          gen_id)
-
-    let nested_escaped_idents = ref []
-    let reset_nested_escaped_ident () = nested_escaped_idents := []
-    let gen_nested_escaped_expr_ident,
-        gen_nested_escaped_ident =
-      let r = ref 0 in
-      (fun () ->
-         incr r;
-         Helpers.nested_escaped_ident_prefix ^ string_of_int !r),
-      (fun id ->
-        let id = (Ast.map_loc (fun _ -> Loc.ghost))#ident id in
-        try List.assoc id !nested_escaped_idents
-        with Not_found ->
-          incr r;
-          let gen_id =
-            Helpers.nested_escaped_ident_prefix ^ string_of_int !r in
-          nested_escaped_idents := (id, gen_id) :: !nested_escaped_idents;
-          gen_id)
-
-    let
-      gen_injected_expr_ident ,
-      gen_injected_ident ,
-      reset_injected_ident =
-      let injected_idents = ref [] in
-      let r = ref 0 in
-      let gen_ident loc =
-        let hash = Helpers.file_hash loc in
-        incr r;
-        Printf.sprintf (Helpers.injected_ident_fmt ()) hash !r
-      in
-      let gen_injected_ident loc id =
-        let id = (Ast.map_loc (fun _ -> Loc.ghost))#ident id in
-        try List.assoc id !injected_idents
-        with Not_found ->
-          let gen_id = gen_ident loc in
-          injected_idents := (id, gen_id) :: !injected_idents;
-          gen_id
-      and reset () = injected_idents := [] in
-      gen_ident, gen_injected_ident, reset
-
-
-    (* BBB Before the syntax error was thrown in the productions dummy_set_*. This
-       resulted in wrong error locations. The solution is to let the dummy productions
-       return an option and raise the syntax error in the enclosing production. *)
-    let from_some_or_raise opt loc f fmt =
-      match opt with
-        | Some x ->
-            Printf.ksprintf (fun _ -> f x) fmt
-        | None ->
-            Printf.ksprintf (Syntax_error.raise loc) fmt
-
-    module E2 = Camlp4.ErrorHandler.Register(Syntax_error) ;;
-
-    try
-      DELETE_RULE Gram expr: "{"; TRY [label_expr_list; "}"] END
-    with Camlp4.Struct.Grammar.Delete.Rule_not_found _ ->
-      (let test_record_field =
-         Gram.Entry.of_parser "record_field" (fun strm ->
-           let rec loop = function
-             | [] -> ()
-             | (UIDENT _, _) :: (KEYWORD ".", _) :: rest -> loop rest
-             | (LIDENT _, _) :: (KEYWORD "=", _) :: _    -> ()
-             | (LIDENT _, _) :: (KEYWORD ";", _) :: _    -> ()
-             | [LIDENT _, _] -> ()
-             | _ -> raise Stream.Failure
-           in
-           loop (Stream.npeek 100 strm))
-       in
-       DELETE_RULE Gram expr:
-         "{"; test_record_field; label_expr_list; "}" END) ;;
-
-    DELETE_RULE Gram expr: "{"; TRY [expr LEVEL "."; "with"]; label_expr_list; "}" END;
-
-    (* Extending syntax *)
-    EXTEND Gram
-    GLOBAL: str_item sig_item expr module_expr module_binding0 str_items sig_items implem interf;
-
-    (* Dummy rules: for level management and checking. *)
-      dummy_set_level_shared:
-        [[ ->
-             begin match !current_level with
-              | Toplevel -> set_current_level Shared_item; Some ()
-              | _ -> None
-        end
-         ]];
-      dummy_set_level_server:
-        [[ ->  match !current_level with
-               | Toplevel -> set_current_level Server_item; Some ()
-               | _ -> None
-         ]];
-      dummy_set_level_client:
-        [[ ->
-             match !current_level with
-              | Toplevel -> set_current_level Client_item; Some ()
-              | _ -> None
-         ]];
-      dummy_set_level_client_value_expr:
-        [[ -> reset_escaped_ident (); reset_nested_escaped_ident ();
-             match !current_level with
-               | Toplevel | Toplevel_module_expr | Server_item
-               | Shared_item | (Shared_expr _) as old ->
-                   set_current_level (Hole_expr (client_value_context old));
-                   Some old
-               | Client_item | Hole_expr _ | Escaped_expr _
-               | Escaped_expr_in_shared _ | Injected_expr _
-               | Module_expr ->
-                   None
-         ]];
-      dummy_set_level_shared_value_expr:
-        [[ -> reset_escaped_ident ();
-           match !current_level with
-               | Toplevel | Toplevel_module_expr | Server_item as old ->
-                   set_current_level (Shared_expr `Server);
-                   Some old
-               | Shared_item ->
-                   set_current_level (Shared_expr `Shared);
-                   Some Shared_item
-               | Client_item | Shared_expr _ | Hole_expr _
-               | Escaped_expr _ | Escaped_expr_in_shared _
-               | Injected_expr _ | Module_expr ->
-                   None
-         ]];
-      dummy_check_level_escaped_ident:
-        [[ -> match !current_level with
-              | Hole_expr context ->
-                  Some (Escaped_in_client_value_in context)
-              | Shared_expr context ->
-                  Some (Escaped_in_shared_value_in context)
-              | Client_item ->
-                  Some (Injected_in `Client)
-              | Shared_item ->
-                  Some (Injected_in `Shared)
-              | _ -> None
-         ]];
-      dummy_set_level_escaped_expr:
-        [[ -> match !current_level with
-              | Hole_expr context ->
-                  set_current_level (Escaped_expr context);
-                  Some (Escaped_in_client_value_in context)
-              | Shared_expr context ->
-                  set_current_level (Escaped_expr_in_shared context);
-                  Some (Escaped_in_shared_value_in context)
-              | Client_item ->
-                  set_current_level (Injected_expr `Client);
-                  Some (Injected_in `Client)
-              | Shared_item ->
-                  set_current_level (Injected_expr `Shared);
-                  Some (Injected_in `Shared)
-              | _ -> None
-         ]];
-      dummy_set_level_module_expr:
-        [[ -> match !current_level with
-              | Toplevel ->
-                 set_current_level Toplevel_module_expr;
-                 Toplevel
-              | lvl -> lvl ]];
-
-      str_items: FIRST
-        [[ lvl = dummy_set_level_module_expr;
-           me = SELF -> set_current_level lvl; me ]];
-
-      sig_items: FIRST
-        [[ lvl = dummy_set_level_module_expr; me = SELF ->
-           set_current_level lvl; me ]];
-
-      (* Duplicated from camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml *)
-      module_expr: BEFORE "top"
-        [[ "functor"; "("; i = a_UIDENT; ":"; t = module_type; ")"; "->";
-            lvl = dummy_set_level_module_expr;
-            me = SELF ->
-            set_current_level lvl; <:module_expr< functor ( $i$ : $t$ ) -> $me$ >> ]];
-
-      (* Duplicated from camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml *)
-      module_binding0: FIRST
-      [ RIGHTA
-        [ "("; m = a_UIDENT; ":"; mt = module_type; ")";
-          lvl = dummy_set_level_module_expr; mb = SELF ->
-            set_current_level lvl; <:module_expr< functor ( $m$ : $mt$ ) -> $mb$ >> ]];
-
-      sig_item: BEFORE "top"
-        [ "eliom"
-         [ KEYWORD "{shared{" ; opt = dummy_set_level_shared ; es = LIST0 sig_item ; KEYWORD "}}" ->
-           from_some_or_raise opt _loc
-             (fun () ->
-               set_current_level Toplevel;
-               Pass.shared_sig_items _loc es)
-             "The syntax {shared{ ... }} is only allowed at toplevel"
-         | KEYWORD "{server{" ; opt = dummy_set_level_server ; es = LIST0 sig_item ; KEYWORD "}}" ->
-             from_some_or_raise opt _loc
-               (fun () ->
-                  set_current_level Toplevel;
-                  Pass.server_sig_items _loc es)
-               "The syntax {server{ ... }} is only allowed at toplevel"
-         | KEYWORD "{client{" ; opt = dummy_set_level_client ; es = LIST0 sig_item ; KEYWORD "}}" ->
-             from_some_or_raise opt _loc
-               (fun () ->
-                  set_current_level Toplevel;
-                  Pass.client_sig_items _loc es)
-               "The syntax {client{ ... }} is only allowed at toplevel"
-         | si = sig_item LEVEL "top" ->
-             if !current_level = Toplevel then
-               Pass.server_sig_items _loc [si]
-             else
-               si
-         ]];
-
-
-      (* To str_item we add {client{ ... }}, {server{ ... }} and {shared{ ... }} *)
-      str_item: BEFORE "top"
-
-        [ "eliom"
-
-         [ KEYWORD "{shared{" ; opt = dummy_set_level_shared ; es = LIST0 str_item ; KEYWORD "}}" ->
-             from_some_or_raise opt _loc
-               (fun () ->
-                  set_current_level Toplevel;
-                  let v = Pass.shared_str_items _loc es in
-                  reset_injected_ident () ; v)
-               "The syntax {shared{ ... }} is only allowed at toplevel"
-
-         | KEYWORD "{server{" ; opt = dummy_set_level_server ; es = LIST0 str_item ; KEYWORD "}}" ->
-             from_some_or_raise opt _loc
-               (fun () ->
-                  set_current_level Toplevel;
-                  Pass.server_str_items _loc es)
-               "The syntax {server{ ... }} is only allowed at toplevel"
-
-         | KEYWORD "{client{" ; opt = dummy_set_level_client ; es = LIST0 str_item ; KEYWORD "}}" ->
-             from_some_or_raise opt _loc
-               (fun () ->
-                  set_current_level Toplevel;
-                  let v = Pass.client_str_items _loc es in
-                  reset_injected_ident () ; v)
-               "The syntax {client{ ... }} is only allowed at toplevel"
-
-         | si = str_item LEVEL "top" ->
-
-             if !current_level = Toplevel then
-               Pass.server_str_items _loc [si]
-             else
-               si
-
-         ]];
-
-      (* To expr we add {{ ... }} and %IDENT *)
-
-      expr: LEVEL "simple"
-
-        [ [ KEYWORD "{"; lel = TRY [lel = label_expr_list; "}" -> lel] ->
-            Ast.ExRec (_loc, lel, Ast.ExNil _loc)
-          | KEYWORD "{shared#";
-            typ = TRY [ typ = OPT ctyp; KEYWORD "{" -> typ];
-            opt_lvl = dummy_set_level_shared_value_expr ;
-            e = expr; KEYWORD "}}" ->
-              from_some_or_raise opt_lvl _loc
-                (fun lvl ->
-                   set_current_level lvl;
-                   let id = gen_closure_id _loc in
-                   Pass.shared_value_expr typ (shared_value_context lvl) e
-                     id (gen_closure_escaped_ident id) _loc)
-                "The syntax {shared# type{ ... } is not allowed in %s."
-                (level_to_string !current_level)
-          | KEYWORD "{"; typ = TRY [ typ = OPT ctyp; KEYWORD "{" -> typ]; opt_lvl = dummy_set_level_client_value_expr ; e = expr; KEYWORD "}}" ->
-              from_some_or_raise opt_lvl _loc
-                (fun lvl ->
-                   set_current_level lvl;
-                   let id = gen_closure_id _loc in
-                   Pass.client_value_expr typ (client_value_context lvl) e
-                     id (gen_closure_escaped_ident id) _loc)
-                "The syntax {type{ ... } is not allowed in %s."
-                (level_to_string !current_level)
-          | KEYWORD "{"; e = TRY [e = expr LEVEL "."; "with" -> e]; lel = label_expr_list; "}" ->
-              <:expr< { ($e$) with $lel$ } >>
-          | KEYWORD "{{"; opt_lvl = dummy_set_level_client_value_expr ; e = expr; KEYWORD "}}" ->
-              from_some_or_raise opt_lvl _loc
-                (fun lvl ->
-                   set_current_level lvl;
-                   let id = gen_closure_id _loc in
-                   Pass.client_value_expr None (client_value_context lvl) e
-                     id (gen_closure_escaped_ident id) _loc)
-                "The syntax {{ ... }} is not allowed in %s."
-                (level_to_string !current_level)
-           ] ];
-
-      expr: BEFORE "simple"
-
-        [ [ SYMBOL "%" ; id = ident ; opt_context = dummy_check_level_escaped_ident ->
-              from_some_or_raise opt_context _loc
-                (fun context ->
-                     let gen_id =
-                       match context with
-                         | Escaped_in_client_value_in (`Shared_expr _) ->
-                             gen_nested_escaped_ident id
-                         | Escaped_in_client_value_in _
-                         | Escaped_in_shared_value_in _ ->
-                             gen_escaped_ident id
-                         | Injected_in _ ->
-                             gen_injected_ident _loc id
-                     in
-                     Pass.escape_inject context ?ident:(Helpers.string_of_ident id) <:expr< $id:id$ >> gen_id)
-                "The syntax \"%%ident\" is not allowed in %s."
-                (level_to_string !current_level)
-
-          | SYMBOL "%" ; KEYWORD "(" ; opt_context = dummy_set_level_escaped_expr ; e = SELF ; KEYWORD ")" ->
-              from_some_or_raise opt_context _loc
-                (fun context ->
-                   set_current_level
-                     (match context with
-                        | Escaped_in_client_value_in context -> Hole_expr context
-                        | Escaped_in_shared_value_in context -> Shared_expr context
-                        | Injected_in context -> injection_context_to_parsing_level context);
-                   let gen_id =
-                     match context with
-                       | Escaped_in_client_value_in (`Shared_expr _) ->
-                           gen_nested_escaped_expr_ident ()
-                       | Escaped_in_client_value_in _
-                       | Escaped_in_shared_value_in _ ->
-                           gen_escaped_expr_ident ()
-                       | Injected_in _ ->
-                           gen_injected_expr_ident _loc
-                   in
-                   Pass.escape_inject context e gen_id)
-                "The syntax \"%%(...)\" is not allowed in %s."
-                (level_to_string !current_level)
-         ]];
-
-      (* Cf. Camlp4OCamlRevisedParser *)
-      implem:
-        [[ si = str_item; semi; (sil, stopped) = SELF ->
-             (Pass.implem _loc (si :: sil), stopped)
-         | `EOI -> ([], None)
-        ]];
-
-      interf:
-        [[ si = sig_item; semi; (sil, stopped) = SELF ->
-           (si :: sil, stopped)
-         | `EOI -> ([], None) ]];
-
-
-      END
-
-  end
-
-  (** Register syntax extension *)
-
-  module Id : Camlp4.Sig.Id = struct
-    let name = "Eliom source file syntax ("^ Id.name ^")"
-    let version = "3.0+alpha"
-  end
-
-  module M = Camlp4.Register.OCamlSyntaxExtension(Id)(Make)
-
-end
-
-
-module Make(Syntax : Camlp4.Sig.Camlp4Syntax) = struct
-
-  include Syntax
-
-  (* Extending syntax *)
-  EXTEND Gram
-  GLOBAL: implem interf;
-
-  implem: FIRST
-    [[ (sil, stopped) = implem LEVEL "top" ->
-      ( sil , stopped) ]
-  | "top" [] ];
-
-  interf: FIRST
-    [[ (sil, stopped) = interf LEVEL "top" ->
-      ( sil , stopped) ]
-  | "top" [] ];
-
-  END
-end
-
-module Id : Camlp4.Sig.Id = struct
-  let name = "Eliom source file syntax (common)"
-  let version = "3.0"
-end
-
-module M = Camlp4.Register.OCamlSyntaxExtension(Id)(Make)
diff --git a/src/syntax/pa_eliom_type_filter.ml b/src/syntax/pa_eliom_type_filter.ml
deleted file mode 100644
index 73a884a870..0000000000
--- a/src/syntax/pa_eliom_type_filter.ml
+++ /dev/null
@@ -1,157 +0,0 @@
-(* Ocsigen
- * http://www.ocsigen.org
- * Copyright (C) 2010-2011
- * Raphaël Proust, Grégoire Henry
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, with linking exception;
- * either version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *)
-
-(* This module generates the file used to infer types (hence wrappers) of server
-   escaped values.
-
-   Server-specific and escaped expression will be kept only for
-   type-checking. In order to export type of escaped expressions: it
-   generates for each escaped expression a toplevel definition that
-   looks like:
-
-     let $global_id$ = ref None
-
-   And client-side expressions are replaced by lists of initializers
-   (one per escaped expressions):
-
-     $global_id$ := Some $expr$
-
-*)
-
-module Id = struct
-  let name = "type-inference"
-end
-
-module Type_pass(Helpers : Pa_eliom_seed.Helpers) = struct
-
-  open Helpers.Syntax
-
-  (* accumulator, push and flush for typing expression
-     <:expr< $gen_id$ := Some $orig_expr$ >> *)
-  let push_typing_expr, flush_typing_expr =
-    let typing_expr = ref [] in
-    let add orig_expr gen_id =
-      let _loc = Ast.loc_of_expr orig_expr in
-      if List.for_all (function gen_id', _ -> gen_id <> gen_id') !typing_expr then
-        typing_expr := (gen_id, <:expr< $lid:gen_id$ := Some $orig_expr$ >>) :: !typing_expr
-    in
-    let flush () =
-      let res = List.rev (List.map snd !typing_expr) in
-      typing_expr := [];
-      Ast.exSem_of_list res
-    in
-    add, flush
-
-  (* accumulator, push and flush for typing str_items
-     <:str_item< let $gen_id$ = ref None >> *)
-  let push_typing_str_item, flush_typing_str_item =
-    let typing_strs = ref [] in
-    let add orig_expr gen_id =
-      let _loc = Ast.loc_of_expr orig_expr in
-      if List.for_all (function gen_id', _ -> gen_id' <> gen_id) !typing_strs then
-        typing_strs := (gen_id, <:str_item< let $lid:gen_id$ = Pervasives.ref None >>) :: !typing_strs
-    in
-    let flush () =
-      let res = List.map snd !typing_strs in
-      typing_strs := [];
-      Ast.stSem_of_list res
-    in
-    add, flush
-
-  (** Syntax extension *)
-
-  let client_str_items _loc items =
-    Ast.stSem_of_list [
-      flush_typing_str_item ();
-      (let _loc = Loc.ghost in
-       <:str_item< let () = begin $flush_typing_expr ()$ end >>);
-    ]
-
-  let server_str_items _loc items =
-    Ast.stSem_of_list (flush_typing_str_item () :: items)
-
-  let shared_str_items = server_str_items
-
-  let client_value_expr typ context_level orig_expr gen_id gen_tid loc =
-    push_typing_str_item orig_expr gen_tid;
-    let typ = match typ with
-      | Some typ -> typ
-      | None -> let _loc = Loc.ghost in <:ctyp< _ >>
-    in
-    let _loc = loc in
-    <:expr< begin
-      $flush_typing_expr ()$;
-      $lid:gen_tid$ := Some (Eliom_syntax.client_value "" 0 : $typ$ Eliom_client_value.t);
-            match ! $lid:gen_tid $ with
-            | Some x -> (x : _ Eliom_client_value.t)
-            | None -> assert false
-    end >>
-
-  let shared_value_expr typ _ orig_expr gen_id gen_tid loc =
-    push_typing_str_item orig_expr gen_tid;
-    let typ = match typ with
-      | Some typ -> typ
-      | None -> let _loc = Loc.ghost in <:ctyp< _ >>
-    in
-    let _loc = loc in
-    <:expr<
-      Eliom_shared.Value.create $orig_expr$
-        begin
-          $flush_typing_expr ()$;
-          $lid:gen_tid$ :=
-            Some (Eliom_syntax.client_value "" 0 :
-                   $typ$ Eliom_client_value.t);
-          match ! $lid:gen_tid $ with
-          | Some x -> x
-          | None -> assert false
-        end >>
-
-  let escape_inject context_level ?ident orig_expr gen_id =
-    let open Pa_eliom_seed in
-    push_typing_str_item orig_expr gen_id;
-    push_typing_expr orig_expr gen_id;
-    match context_level with
-      | Escaped_in_shared_value_in _ ->
-          orig_expr
-      | Escaped_in_client_value_in _ ->
-          let _loc = Ast.loc_of_expr orig_expr in
-          <:expr< >>
-      | Injected_in `Shared ->
-          orig_expr
-      | Injected_in `Client ->
-          let _loc = Ast.loc_of_expr orig_expr in
-          <:expr< >>
-
-  let implem loc sil =
-    let _loc = Loc.ghost in
-    let debug_compilation_unit_name =
-      let name = Printf.sprintf "__eliom__compilation_unit_id__%s"
-        (Helpers.file_hash loc) in
-      <:str_item< let $lid:name$ = () >>
-    in
-    debug_compilation_unit_name :: sil
-
-  let shared_sig_items _ _ = let _loc = Loc.ghost in <:sig_item< >>
-  let server_sig_items _ _ = let _loc = Loc.ghost in <:sig_item< >>
-  let client_sig_items _ _ = let _loc = Loc.ghost in <:sig_item< >>
-
-end
-
-module M = Pa_eliom_seed.Register(Id)(Type_pass)
diff --git a/src/tools/dune b/src/tools/dune
new file mode 100644
index 0000000000..80b99ecbd7
--- /dev/null
+++ b/src/tools/dune
@@ -0,0 +1,47 @@
+(library
+  (name tools_utils)
+  (wrapped false)
+  (modules utils)
+  (libraries findlib unix))
+
+(executable
+  (name eliomdep)
+  (public_name eliomdep)
+  (libraries
+    findlib
+    tools_utils
+    unix)
+  (modules
+    eliomdep))
+
+(executable
+  (name distillery)
+  (public_name eliom-distillery)
+  (libraries
+    findlib
+    str
+    tools_utils)
+  (modules
+    distillery))
+
+(executable
+  (name eliomc)
+  (public_name eliomc)
+  (libraries
+    findlib
+    tools_utils
+    unix)
+  (modules
+    eliomc))
+
+(install
+  (section bin)
+  (files (eliomc.exe as js_of_eliom)))
+
+(install
+  (section bin)
+  (files (eliomc.exe as eliomopt)))
+
+(install
+  (section bin)
+  (files (eliomc.exe as eliomcp)))
diff --git a/src/tools/utils.ml b/src/tools/utils.ml
index 2dafcc42ee..01a439b919 100644
--- a/src/tools/utils.ml
+++ b/src/tools/utils.ml
@@ -111,7 +111,7 @@ let with_autoload all_pkgs =
   if !autoload_predef
   then begin
     (* Format.eprintf "\nAUTOLOADING PREDEF PKGS\n%s\n@." (String.concat ", " all_pkgs); *)
-    let l = "eliom.syntax.predef"::all_pkgs in
+    let l = "eliom_camlp4.syntax.predef"::all_pkgs in
     if !type_conv
     then "deriving.syntax.tc"::"type_conv"::l
     else "deriving.syntax.std"::l
@@ -366,18 +366,18 @@ let preprocess_opt ?(ocaml = false) ?kind opts =
   | `Camlp4 ->
     let pkg = match ocaml, simplify_kind ?kind () with
       | true, _ -> []
-      | false, `Client -> ["eliom.syntax.client"]
-      | false, `Server -> ["eliom.syntax.server"]
-      | false, `Types  -> ["eliom.syntax.type"]
+      | false, `Client -> ["eliom_camlp4.syntax.client"]
+      | false, `Server -> ["eliom_camlp4.syntax.server"]
+      | false, `Types  -> ["eliom_camlp4.syntax.type"]
     in
     [ "-pp"; get_pp pkg ^ " " ^ String.concat " " opts ]
   | `Ppx when ocaml ->
     []
   | `Ppx ->
     let pkg = match simplify_kind ?kind () with
-      | `Client -> "eliom.ppx.client"
-      | `Server -> "eliom.ppx.server"
-      | `Types  -> "eliom.ppx.type"
+      | `Client -> "ppx_eliom.ppx.client"
+      | `Server -> "ppx_eliom.ppx.server"
+      | `Types  -> "ppx_eliom.ppx.type"
     in
     [ "-ppx"; get_ppx pkg ^ " " ^ String.concat " " opts ]