diff --git a/apk/vmmgr b/apk/vmmgr
index ff9a12a..71604f2 160000
--- a/apk/vmmgr
+++ b/apk/vmmgr
@@ -1 +1 @@
-Subproject commit ff9a12af65ad6e0a036a74006c7d85578d4be746
+Subproject commit 71604f26b6cd26e3d7cef720401bdc24bb13bd16
diff --git a/build/build-all.sh b/build/build-all.sh
index 6dd84c1..e640bfc 100755
--- a/build/build-all.sh
+++ b/build/build-all.sh
@@ -72,9 +72,6 @@ spoc-app publish cts/app
 spoc-image build -p decidim/image
 spoc-app publish decidim/app
 
-spoc-image build -p ecogis/image
-# spoc-app publish ecogis/app
-
 spoc-image build -p frontlinesms/image
 spoc-app publish frontlinesms/app
 
@@ -111,8 +108,5 @@ spoc-app publish sambro/app
 spoc-image build -p seeddms/image
 spoc-app publish seeddms/app
 
-spoc-image build -p sigmah/image
-spoc-app publish sigmah/app
-
 spoc-image build -p ushahidi/image
 spoc-app publish ushahidi/app
diff --git a/lxc-apps/ecogis/app b/extra/graveyard/ecogis/app
similarity index 100%
rename from lxc-apps/ecogis/app
rename to extra/graveyard/ecogis/app
diff --git a/lxc-apps/ecogis/image b/extra/graveyard/ecogis/image
similarity index 100%
rename from lxc-apps/ecogis/image
rename to extra/graveyard/ecogis/image
diff --git a/lxc-apps/ecogis/image.d/etc/nginx/nginx.conf b/extra/graveyard/ecogis/image.d/etc/nginx/nginx.conf
similarity index 100%
rename from lxc-apps/ecogis/image.d/etc/nginx/nginx.conf
rename to extra/graveyard/ecogis/image.d/etc/nginx/nginx.conf
diff --git a/lxc-apps/ecogis/image.d/etc/php5/php-fpm.conf b/extra/graveyard/ecogis/image.d/etc/php5/php-fpm.conf
similarity index 100%
rename from lxc-apps/ecogis/image.d/etc/php5/php-fpm.conf
rename to extra/graveyard/ecogis/image.d/etc/php5/php-fpm.conf
diff --git a/lxc-apps/ecogis/image.d/etc/services.d/.s6-svscan/finish b/extra/graveyard/ecogis/image.d/etc/services.d/.s6-svscan/finish
similarity index 100%
rename from lxc-apps/ecogis/image.d/etc/services.d/.s6-svscan/finish
rename to extra/graveyard/ecogis/image.d/etc/services.d/.s6-svscan/finish
diff --git a/lxc-apps/ecogis/image.d/etc/services.d/nginx/run b/extra/graveyard/ecogis/image.d/etc/services.d/nginx/run
similarity index 100%
rename from lxc-apps/ecogis/image.d/etc/services.d/nginx/run
rename to extra/graveyard/ecogis/image.d/etc/services.d/nginx/run
diff --git a/lxc-apps/ecogis/image.d/etc/services.d/php-fpm/run b/extra/graveyard/ecogis/image.d/etc/services.d/php-fpm/run
similarity index 100%
rename from lxc-apps/ecogis/image.d/etc/services.d/php-fpm/run
rename to extra/graveyard/ecogis/image.d/etc/services.d/php-fpm/run
diff --git a/lxc-apps/ecogis/install.sh b/extra/graveyard/ecogis/install.sh
similarity index 100%
rename from lxc-apps/ecogis/install.sh
rename to extra/graveyard/ecogis/install.sh
diff --git a/lxc-apps/ecogis/install/createdb.sql b/extra/graveyard/ecogis/install/createdb.sql
similarity index 100%
rename from lxc-apps/ecogis/install/createdb.sql
rename to extra/graveyard/ecogis/install/createdb.sql
diff --git a/lxc-apps/ecogis/install/ecogis_conf/config.php b/extra/graveyard/ecogis/install/ecogis_conf/config.php
similarity index 100%
rename from lxc-apps/ecogis/install/ecogis_conf/config.php
rename to extra/graveyard/ecogis/install/ecogis_conf/config.php
diff --git a/lxc-apps/ecogis/install/postgres_data/pg_hba.conf b/extra/graveyard/ecogis/install/postgres_data/pg_hba.conf
similarity index 100%
rename from lxc-apps/ecogis/install/postgres_data/pg_hba.conf
rename to extra/graveyard/ecogis/install/postgres_data/pg_hba.conf
diff --git a/lxc-apps/ecogis/install/postgres_data/postgresql.conf b/extra/graveyard/ecogis/install/postgres_data/postgresql.conf
similarity index 100%
rename from lxc-apps/ecogis/install/postgres_data/postgresql.conf
rename to extra/graveyard/ecogis/install/postgres_data/postgresql.conf
diff --git a/lxc-apps/ecogis/uninstall.sh b/extra/graveyard/ecogis/uninstall.sh
similarity index 100%
rename from lxc-apps/ecogis/uninstall.sh
rename to extra/graveyard/ecogis/uninstall.sh
diff --git a/lxc-apps/sigmah/app b/extra/graveyard/sigmah/app
similarity index 100%
rename from lxc-apps/sigmah/app
rename to extra/graveyard/sigmah/app
diff --git a/lxc-apps/sigmah/image b/extra/graveyard/sigmah/image
similarity index 100%
rename from lxc-apps/sigmah/image
rename to extra/graveyard/sigmah/image
diff --git a/lxc-apps/sigmah/image.d/srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml b/extra/graveyard/sigmah/image.d/srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml
similarity index 100%
rename from lxc-apps/sigmah/image.d/srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml
rename to extra/graveyard/sigmah/image.d/srv/tomcat/webapps/sigmah/WEB-INF/classes/logback.xml
diff --git a/lxc-apps/sigmah/install.sh b/extra/graveyard/sigmah/install.sh
similarity index 100%
rename from lxc-apps/sigmah/install.sh
rename to extra/graveyard/sigmah/install.sh
diff --git a/lxc-apps/sigmah/install/createdb.sql b/extra/graveyard/sigmah/install/createdb.sql
similarity index 100%
rename from lxc-apps/sigmah/install/createdb.sql
rename to extra/graveyard/sigmah/install/createdb.sql
diff --git a/lxc-apps/sigmah/install/postgres_data/pg_hba.conf b/extra/graveyard/sigmah/install/postgres_data/pg_hba.conf
similarity index 100%
rename from lxc-apps/sigmah/install/postgres_data/pg_hba.conf
rename to extra/graveyard/sigmah/install/postgres_data/pg_hba.conf
diff --git a/lxc-apps/sigmah/install/postgres_data/postgresql.conf b/extra/graveyard/sigmah/install/postgres_data/postgresql.conf
similarity index 100%
rename from lxc-apps/sigmah/install/postgres_data/postgresql.conf
rename to extra/graveyard/sigmah/install/postgres_data/postgresql.conf
diff --git a/lxc-apps/sigmah/install/sigmah_conf/persistence.xml b/extra/graveyard/sigmah/install/sigmah_conf/persistence.xml
similarity index 100%
rename from lxc-apps/sigmah/install/sigmah_conf/persistence.xml
rename to extra/graveyard/sigmah/install/sigmah_conf/persistence.xml
diff --git a/lxc-apps/sigmah/install/sigmah_conf/sigmah.properties b/extra/graveyard/sigmah/install/sigmah_conf/sigmah.properties
similarity index 100%
rename from lxc-apps/sigmah/install/sigmah_conf/sigmah.properties
rename to extra/graveyard/sigmah/install/sigmah_conf/sigmah.properties
diff --git a/lxc-apps/sigmah/install/update-conf.sh b/extra/graveyard/sigmah/install/update-conf.sh
similarity index 100%
rename from lxc-apps/sigmah/install/update-conf.sh
rename to extra/graveyard/sigmah/install/update-conf.sh
diff --git a/lxc-apps/sigmah/uninstall.sh b/extra/graveyard/sigmah/uninstall.sh
similarity index 100%
rename from lxc-apps/sigmah/uninstall.sh
rename to extra/graveyard/sigmah/uninstall.sh
diff --git a/extra/frontlinesms-lang-js.py b/extra/helpers/frontlinesms-lang-js.py
similarity index 100%
rename from extra/frontlinesms-lang-js.py
rename to extra/helpers/frontlinesms-lang-js.py
diff --git a/extra/sahana-lang-csv.py b/extra/helpers/sahana-lang-csv.py
similarity index 100%
rename from extra/sahana-lang-csv.py
rename to extra/helpers/sahana-lang-csv.py
diff --git a/extra/myip.php b/extra/www/myip.php
similarity index 100%
rename from extra/myip.php
rename to extra/www/myip.php
diff --git a/extra/vm-ping.php b/extra/www/vm-ping.php
similarity index 100%
rename from extra/vm-ping.php
rename to extra/www/vm-ping.php