diff --git a/Makefile b/Makefile
index f7e1d2038..732dd1e2f 100644
--- a/Makefile
+++ b/Makefile
@@ -636,7 +636,7 @@ install_fastcgi_server:
 install_uwsgi_server:
 	@install -v -d $(RUWSGIYAMLDIR) $(RLLNGAPPDIR)
 	@install -m 644 -v fastcgi-server/uwsgi/llng-server.yaml $(RUWSGIYAMLDIR)/llng-server.yaml
-	@install -m 644 -v _example/plack-app/llng-server.psgi $(RLLNGAPPDIR)/llng-server.psgi
+	@install -m 644 -v $(SRCHANDLERDIR)/eg/llng-server.psgi $(RLLNGAPPDIR)/llng-server.psgi
 	$(PERL) -pi -e 's#__APPDIR__#$(LLNGAPPDIR)#' $(RUWSGIYAMLDIR)/llng-server.yaml
 
 # Site install
diff --git a/debian/control b/debian/control
index 3054b3cf8..b1e97b77a 100644
--- a/debian/control
+++ b/debian/control
@@ -47,8 +47,8 @@ Build-Depends-Indep: libapache-session-perl,
                      libxml-simple-perl,
                      perl
 Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/lemonldap-ng.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/lemonldap-ng.git
+Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/lemonldap-ng
+Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/lemonldap-ng.git
 Homepage: https://lemonldap-ng.org/
 
 Package: lemonldap-ng
@@ -140,7 +140,7 @@ Depends: ${misc:Depends},
          ${perl:Depends},
          libconvert-pem-perl,
          libcrypt-openssl-rsa-perl,
-         liblemonldap-ng-handler-perl (= ${binary:Version})
+         liblemonldap-ng-handler-perl (= ${binary:Version}),
          lemonldap-ng-fastcgi-server (= ${binary:Version}) | lemonldap-ng-uwsgi-app (= ${binary:Version}) | apache2 | httpd-cgi
 Recommends: lemonldap-ng-doc (= ${binary:Version}),
             libxml-libxml-perl,
diff --git a/debian/copyright b/debian/copyright
index 495416bb1..5d8a6d28a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -48,13 +48,6 @@ Files: lemonldap-ng-portal/site/htdocs/static/common/modules/CAS.png
 Copyright: Jasig
 License: Apache-2.0
 
-Files: lemonldap-ng-portal/site/htdocs/static/common/modules/BrowserID.png
-Copyright: 2013, Xavier Guimard <x.guimard@free.fr>
-License: CC-3
-Comment: created using images of YellowIcon and Innerer Schweinehund
- (http://findicons.com/icon/168665/firefox?id=292029 and
-  http://commons.wikimedia.org/wiki/File:Mail-closed.svg)
-
 Files: lemonldap-ng-portal/site/htdocs/static/common/modules/Google.png lemonldap-ng-portal/site/htdocs/static/common/modules/Facebook.png
 Copyright: http://tempest.deviantart.com/
 License: CC-3
diff --git a/debian/lemonldap-ng.examples b/debian/lemonldap-ng.examples
index 2b49a2b39..6d4880b41 100644
--- a/debian/lemonldap-ng.examples
+++ b/debian/lemonldap-ng.examples
@@ -1 +1,2 @@
 fastcgi-server/psgi/llngapp.psgi
+lemonldap-ng-common/eg/*
diff --git a/debian/liblemonldap-ng-handler-perl.examples b/debian/liblemonldap-ng-handler-perl.examples
index 020fcfd28..0e6b66ce1 100644
--- a/debian/liblemonldap-ng-handler-perl.examples
+++ b/debian/liblemonldap-ng-handler-perl.examples
@@ -1 +1 @@
-lemonldap-ng-handler/example/handler.psgi
+lemonldap-ng-handler/eg/*
diff --git a/lemonldap-ng-common/MANIFEST b/lemonldap-ng-common/MANIFEST
index 6ef5c0ab1..f82c09a96 100644
--- a/lemonldap-ng-common/MANIFEST
+++ b/lemonldap-ng-common/MANIFEST
@@ -1,4 +1,5 @@
 Changes
+eg/llng-app.psgi
 lemonldap-ng.ini
 lib/Lemonldap/NG/Common.pm
 lib/Lemonldap/NG/Common/Apache/Session.pm
diff --git a/_example/plack-app/llng-app-for-starman.psgi b/lemonldap-ng-common/eg/llng-app.psgi
similarity index 100%
rename from _example/plack-app/llng-app-for-starman.psgi
rename to lemonldap-ng-common/eg/llng-app.psgi
diff --git a/lemonldap-ng-handler/MANIFEST b/lemonldap-ng-handler/MANIFEST
index d5490b4ed..ce7527eb2 100644
--- a/lemonldap-ng-handler/MANIFEST
+++ b/lemonldap-ng-handler/MANIFEST
@@ -1,5 +1,6 @@
 Changes
 eg/handler.psgi
+eg/llng-server.psgi
 eg/scripts/purgeLocalCache
 eg/scripts/purgeLocalCache.cron.d
 lib/Lemonldap/NG/Handler.pm
diff --git a/_example/plack-app/llng-server.psgi b/lemonldap-ng-handler/eg/llng-server.psgi
similarity index 100%
rename from _example/plack-app/llng-server.psgi
rename to lemonldap-ng-handler/eg/llng-server.psgi