diff --git a/activemq/install.sh b/activemq/install.sh
index 5cf9807..4b2f515 100755
--- a/activemq/install.sh
+++ b/activemq/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Configure ActiveMQ
 mkdir -p /srv/activemq/data
diff --git a/basic/srv/vm/templates/setup-apps-row.html b/basic/srv/vm/templates/setup-apps-row.html
index a6eca95..378e1de 100644
--- a/basic/srv/vm/templates/setup-apps-row.html
+++ b/basic/srv/vm/templates/setup-apps-row.html
@@ -2,6 +2,6 @@
     <td>{{ app_title }}</td>
     <td class="center"><input type="checkbox" class="app-visible"{% if app not in conf['apps'] %} disabled{% elif conf['apps'][app]['visible'] %} checked{% endif %}></td>
     <td class="center"><input type="checkbox" class="app-autostart"{% if app not in conf['apps'] %} disabled{% elif is_service_autostarted(app) %} checked{% endif %}></td>
-    <td>{% if app not in conf['apps'] %} N/A{% elif is_service_started(app) %}<span class="info">Spuštěna</span>{% else %}<span class="error">Zastavena</span>{% endif %}</td>
+    <td>{% if app not in conf['apps'] %} Není nainstalována{% elif is_service_started(app) %}<span class="info">Spuštěna</span>{% else %}<span class="error">Zastavena</span>{% endif %}</td>
     <td>{% if app not in conf['apps'] %}<a href="#" class="app-install">Instalovat</a>{% else %}{% if is_service_started(app) %}<a href="#" class="app-stop">Zastavit</a>{% else %}<a href="#" class="app-start">Spustit</a>{% endif %}, <a href="#" class="app-uninstall">Odinstalovat</a>{% endif %}</td>
 </tr>
diff --git a/ckan-datapusher/install.sh b/ckan-datapusher/install.sh
index c97e5ad..cc57be8 100755
--- a/ckan-datapusher/install.sh
+++ b/ckan-datapusher/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Configure CKAN DataPusher
 mkdir -p /srv/ckan-datapusher/conf /srv/ckan-datapusher/data
diff --git a/ckan/install.sh b/ckan/install.sh
index 887ab96..9736df6 100755
--- a/ckan/install.sh
+++ b/ckan/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/crisiscleanup/install.sh b/crisiscleanup/install.sh
index 5641dbe..0972d8c 100755
--- a/crisiscleanup/install.sh
+++ b/crisiscleanup/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/cts/install.sh b/cts/install.sh
index d7a8e34..41d9f1b 100755
--- a/cts/install.sh
+++ b/cts/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/frontlinesms/install.sh b/frontlinesms/install.sh
index 0c2618b..801af0d 100755
--- a/frontlinesms/install.sh
+++ b/frontlinesms/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Configure FrontlineSMS
 mkdir -p /srv/frontlinesms/data
diff --git a/gnuhealth/install.sh b/gnuhealth/install.sh
index 90259f9..b6d2479 100755
--- a/gnuhealth/install.sh
+++ b/gnuhealth/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/kanboard/install.sh b/kanboard/install.sh
index ed6e961..816c010 100755
--- a/kanboard/install.sh
+++ b/kanboard/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/mariadb/install.sh b/mariadb/install.sh
index 49a373d..066ceb3 100755
--- a/mariadb/install.sh
+++ b/mariadb/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Create MariaDB instance
 mkdir -p /srv/mariadb/conf /srv/mariadb/data
diff --git a/mifosx/install.sh b/mifosx/install.sh
index c1904a3..314b868 100755
--- a/mifosx/install.sh
+++ b/mifosx/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/mariadb ] && service mariadb start && STOP_MARIADB=1
diff --git a/motech/install.sh b/motech/install.sh
index 564ec5d..34e4b64 100755
--- a/motech/install.sh
+++ b/motech/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/activemq ] && service activemq start && STOP_ACTIVEMQ=1
diff --git a/opendatakit-build/install.sh b/opendatakit-build/install.sh
index 1d06054..be12ef2 100755
--- a/opendatakit-build/install.sh
+++ b/opendatakit-build/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/opendatakit/install.sh b/opendatakit/install.sh
index aeb72b4..6abc455 100755
--- a/opendatakit/install.sh
+++ b/opendatakit/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/openmapkit/install.sh b/openmapkit/install.sh
index 44e1525..7c5bb99 100755
--- a/openmapkit/install.sh
+++ b/openmapkit/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Configure OpenMapKit
 export OPENMAPKIT_ADMIN_USER="admin"
diff --git a/pandora/install.sh b/pandora/install.sh
index 2833b51..3fb2f4b 100755
--- a/pandora/install.sh
+++ b/pandora/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/postgres/install.sh b/postgres/install.sh
index 4dbcc2e..60de20f 100755
--- a/postgres/install.sh
+++ b/postgres/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Create Postgres instance
 mkdir -p /srv/postgres/data
diff --git a/rabbitmq/install.sh b/rabbitmq/install.sh
index 92b830e..3cd62a5 100755
--- a/rabbitmq/install.sh
+++ b/rabbitmq/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Create RabbitMQ directory structure
 mkdir -p /srv/rabbitmq/data
diff --git a/redis/install.sh b/redis/install.sh
index 86a9af2..168bec8 100755
--- a/redis/install.sh
+++ b/redis/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Configure Redis
 mkdir -p /srv/redis/conf /srv/redis/data
diff --git a/sahana-demo/install.sh b/sahana-demo/install.sh
index 691f636..9b8559c 100755
--- a/sahana-demo/install.sh
+++ b/sahana-demo/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 export TEMPLATE=${TEMPLATE:-"default"}
 
 # Check prerequisites
diff --git a/sahana/install.sh b/sahana/install.sh
index cec59bd..98c0246 100755
--- a/sahana/install.sh
+++ b/sahana/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/sambro/install.sh b/sambro/install.sh
index c99856e..040bcb2 100755
--- a/sambro/install.sh
+++ b/sambro/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/seeddms/install.sh b/seeddms/install.sh
index bb8b219..c0ca28d 100755
--- a/seeddms/install.sh
+++ b/seeddms/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/sigmah/install.sh b/sigmah/install.sh
index 0e2ff77..209e220 100755
--- a/sigmah/install.sh
+++ b/sigmah/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/postgres ] && service postgres start && STOP_POSTGRES=1
diff --git a/solr/install.sh b/solr/install.sh
index 63f46dd..2eaef4b 100755
--- a/solr/install.sh
+++ b/solr/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Configure Solr
 mkdir -p /srv/solr/data
diff --git a/ushahidi/install.sh b/ushahidi/install.sh
index 93df3c2..072217f 100755
--- a/ushahidi/install.sh
+++ b/ushahidi/install.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-cd $(realpath $(dirname "${0}"))/setup
+cd $(realpath $(dirname "${0}"))/install
 
 # Check prerequisites
 [ ! -e /run/openrc/started/mariadb ] && service mariadb start && STOP_MARIADB=1