diff --git a/.build.config b/.build.config
deleted file mode 100644
index 69b72f2..0000000
--- a/.build.config
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-PROJECT_NAME="I Fatti di Napoli 2.0"
-APPLICATION_BUILDNAME="fdn2"
-
-###########################
-####### APACHE DATA #######
-###########################
-APACHE2_USER="www-data"
-APACHE2_GROUP="www-data"
-APACHE2_DOCUMENTROOT="/var/www"
-
-
-###########################
-##### SYSTEM DETAILS ######
-###########################
-SYSTEM_LOG_PATH="/var/log/asdynamics"
-SYSTEM_PRIVATE="/home/asdynamics/private"
-SYSTEM_STORAGE="/home/asdynamics/storage"
-SYSTEM_TMP="/tmp/asdynamics"
-
-
-###################################
-##### APPLICATION ESSENTIALS ######
-###################################
-APPLICATION_PUBLIC="$APACHE2_DOCUMENTROOT/$APPLICATION_BUILDNAME"
-APPLICATION_PRIVATE="$SYSTEM_PRIVATE/$APPLICATION_BUILDNAME"
-APPLICATION_STORAGE="$SYSTEM_STORAGE/$APPLICATION_BUILDNAME"
-
-APPLICATION_LOG_PATH="$SYSTEM_LOG_PATH/$APPLICATION_BUILDNAME"
-APPLICATION_XSENDFILE_PATH="/tmp/xsend/$APPLICATION_BUILDNAME"
-
-
-####################################
-##### OTHER APPLICATION PATHS ######
-####################################
-APPLICATION_MEDIA_PATH="$APPLICATION_STORAGE/media"
-APPLICATION_BACKUPS_PATH="$APPLICATION_STORAGE/backup"
-APPLICATION_TMP_PATH="$SYSTEM_TMP/$APPLICATION_BUILDNAME"
-APPLICATION_CONFIG_PATH="$APPLICATION_PRIVATE/common"
-APPLICATION_BINARY_PATH="$APPLICATION_PRIVATE/bin"
-APPLICATION_CRON_PATH="$APPLICATION_PRIVATE/crontab"
-APPLICATION_TASK_PATH="$APPLICATION_PRIVATE/task"
-
diff --git a/.build_db.config b/.build_db.config
deleted file mode 100644
index 92fa58a..0000000
--- a/.build_db.config
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-###########################
-#### MYSQL DATABASES ######
-###########################
-MYSQL_CONNECTION_STRING=""
-
-declare -A MYSQL_DB_CONTENT_TABLES
-declare -A MYSQL_DB_CONFIG_TABLES
-
-MYSQL_DB_CONTENT_TABLES=()
-MYSQL_DB_CONFIG_TABLES=()
-
-while read line || [ -n "$line" ];
-do
-    if echo $line | grep -P "([=][>]).*([=][>])" &>/dev/null
-    then
-	group=$(echo "$line" | sed -r 's/^\s*(\S+)\s*[=][>]\s*(\S+)\s*[=][>]\s*(.+)$/\1/')
-	table=$(echo "$line" | sed -r 's/^\s*(\S+)\s*[=][>]\s*(\S+)\s*[=][>]\s*(.+)$/\2/')
-	query=$(echo "$line" | sed -r 's/^\s*(\S+)\s*[=][>]\s*(\S+)\s*[=][>]\s*(.+)$/\3/')
-	if [ "$group" = "content" ]; then 
-		MYSQL_DB_CONTENT_TABLES["$table"]="$query"
-	elif [ "$group" = "config" ]; then
-		MYSQL_DB_CONFIG_TABLES["$table"]="$query"
-	fi
-    fi
-done < dbCreation.mysql
-
-
-#MYSQL_DB_CONTENT_TABLES=( ["tizi"]="create table tizi" ["posti"]="create table posti" )
-
-
-###########################
-#### MONGO DATABASES ######
-###########################
-MONGO_CONNECTION_STRING=""
-
-declare -A MONGO_DB_CONTENT_COLLECTIONS
-declare -A MONGO_DB_CONFIG_COLLECTIONS
-
-MONGO_DB_CONTENT_COLLECTIONS=()
-MONGO_DB_CONFIG_COLLECTIONS=()
-
-while read line || [ -n "$line" ];
-do
-    if echo $line | grep -P "([=][>]).*([=][>])" &>/dev/null
-    then
-	group=$(echo "$line" | sed -r 's/^\s*(\S+)\s*[=][>]\s*(\S+)\s*[=][>]\s*(.+)$/\1/')
-	table=$(echo "$line" | sed -r 's/^\s*(\S+)\s*[=][>]\s*(\S+)\s*[=][>]\s*(.+)$/\2/')
-	query=$(echo "$line" | sed -r 's/^\s*(\S+)\s*[=][>]\s*(\S+)\s*[=][>]\s*(.+)$/\3/')
-	if [ "$group" = "content" ]; then 
-		MONGO_DB_CONTENT_COLLECTIONS["$table"]="$query"
-	elif [ "$group" = "config" ]; then
-		MONGO_DB_CONFIG_COLLECTIONS["$table"]="$query"
-	fi
-    fi
-done < dbCreation.mongo
-
-
diff --git a/.buildpath b/.buildpath
deleted file mode 100644
index 8bcb4b5..0000000
--- a/.buildpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buildpath>
-	<buildpathentry kind="src" path=""/>
-	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
-</buildpath>
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..37f363a
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,26 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+		{
+            "type": "php",
+            "request": "launch",
+            "name": "Launch Running",
+			"program": "${file}",
+			"cwd": "${fileDirname}",
+			"port": 9090,
+			"runtimeExecutable": "/usr/bin/php",
+			"stopOnEntry": true
+        },
+        {
+            "type": "php",
+            "request": "launch",
+            "name": "Listen PHP Docker",
+			"port": 9090,
+			"pathMappings": {
+				"/var/www/fdn2": "${workspaceRoot}/app/public",
+				"/home/ddninja/private/fdn2": "${workspaceRoot}/app/private",
+				"/home/ddninja/private/asdphp": "/home/rik/workspaces/didato.ninja/Microservices/asdphp-kube/app/private"
+			}
+        }
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..16b1054
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+	"intelephense.environment.includePaths": [
+		"/home/rik/workspaces/didato.ninja/Microservices/asdphp-kube"
+	]
+}
\ No newline at end of file
diff --git a/README.txt b/README.txt
index 0f30530..27b2c68 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,2 @@
-I Fatti di Napoli 2.0
-Nuova applicazione dei fatti di napoli
-Conversione Mobile 2.0
-Versione dao mongo aggiornata per utilizzare le nuove librerie php
\ No newline at end of file
+# I Fatti di Napoli 
+### Versione dockerizzata
diff --git a/app/os/000-api.template.conf b/app/os/000-api.template.conf
new file mode 100644
index 0000000..b412619
--- /dev/null
+++ b/app/os/000-api.template.conf
@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+	
+	DocumentRoot /var/www/§PROJECT_BUILDNAME§
+	<Directory /var/www/§PROJECT_BUILDNAME§>
+		Options FollowSymLinks
+		AllowOverride None
+		Order allow,deny
+		allow from all
+			
+		RewriteEngine On
+
+		RewriteRule "^(.*)$" "index.php" [NC,L,QSA]
+		
+		
+	</Directory>
+	
+</VirtualHost>
+
diff --git a/app/os/000-guiapi.template.conf b/app/os/000-guiapi.template.conf
new file mode 100644
index 0000000..59cd337
--- /dev/null
+++ b/app/os/000-guiapi.template.conf
@@ -0,0 +1,25 @@
+<VirtualHost *:80>
+	
+	DocumentRoot /var/www/§PROJECT_BUILDNAME§
+	<Directory /var/www/§PROJECT_BUILDNAME§>
+		Options FollowSymLinks
+		AllowOverride None
+		Order allow,deny
+		allow from all
+			
+		RewriteEngine On
+
+		RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI}.php -f
+		RewriteRule "^(.*)$" "$1.php" [NC,L,QSA]
+
+		RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -f [OR]
+		RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} -d
+		RewriteRule ^ - [L]
+
+		RewriteRule "^(api/.*)$" "api/index.php" [NC,L,QSA]
+		
+		
+	</Directory>
+	
+</VirtualHost>
+
diff --git a/app/os/opcache.template.ini b/app/os/opcache.template.ini
new file mode 100644
index 0000000..1a08c02
--- /dev/null
+++ b/app/os/opcache.template.ini
@@ -0,0 +1,11 @@
+[opcache]
+opcache.enable=0
+opcache.memory_consumption=128
+opcache.interned_strings_buffer=16
+opcache.max_accelerated_files=10000
+opcache.revalidate_freq=360
+opcache.validate_timestamps=0
+;opcache.preload=/var/www/§PROJECT_BUILDNAME§/load.php
+opcache.preload_user=www-data
+;opcache.blacklist_filename=/var/www/eden/index.php
+opcache.fast_shutdown=1
diff --git a/app/os/php.template.ini b/app/os/php.template.ini
new file mode 100644
index 0000000..bb0b306
--- /dev/null
+++ b/app/os/php.template.ini
@@ -0,0 +1,12 @@
+
+display_errors = Off
+display_startup_errors = On
+zend.exception_ignore_args = On
+
+error_reporting = E_ALL
+session.save_handler=memcached
+session.save_path=memcached:11211
+session.gc_maxlifetime=1800
+
+# post_max_size = 60M
+# upload_max_filesize = 60M
\ No newline at end of file
diff --git a/app/os/webserver-entrypoint b/app/os/webserver-entrypoint
new file mode 100644
index 0000000..05aa914
--- /dev/null
+++ b/app/os/webserver-entrypoint
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+function exit_func {
+	echo "SIGTERM detected"
+	exit 1
+}
+trap exit_func SIGTERM SIGINT
+
+ASD_BINDIR="/home/${DDNINJA_AUTHOR}/private/${DDNINJA_BUILDNAME}/bin"
+
+mkdir -p "/tmp/${DDNINJA_AUTHOR}/${DDNINJA_BUILDNAME}"
+chown -R www-data:www-data "/tmp/${DDNINJA_AUTHOR}/${DDNINJA_BUILDNAME}"
+
+asdphp-entrypoint & wait
+exit $?
diff --git a/private/bin/cronexec b/app/private/bin/cronexec
similarity index 100%
rename from private/bin/cronexec
rename to app/private/bin/cronexec
diff --git a/private/bin/importOldData.php b/app/private/bin/importOldData.php
similarity index 100%
rename from private/bin/importOldData.php
rename to app/private/bin/importOldData.php
diff --git a/private/bin/regenerateAutoUrlsForIndexing.php b/app/private/bin/regenerateAutoUrlsForIndexing.php
similarity index 100%
rename from private/bin/regenerateAutoUrlsForIndexing.php
rename to app/private/bin/regenerateAutoUrlsForIndexing.php
diff --git a/private/bin/retroBuildIDs.php b/app/private/bin/retroBuildIDs.php
similarity index 100%
rename from private/bin/retroBuildIDs.php
rename to app/private/bin/retroBuildIDs.php
diff --git a/private/bin/updateNotizie.php b/app/private/bin/updateNotizie.php
similarity index 100%
rename from private/bin/updateNotizie.php
rename to app/private/bin/updateNotizie.php
diff --git a/private/common/.gitignore b/app/private/common/.gitignore
similarity index 100%
rename from private/common/.gitignore
rename to app/private/common/.gitignore
diff --git a/private/common/config.php b/app/private/common/config.php
similarity index 100%
rename from private/common/config.php
rename to app/private/common/config.php
diff --git a/private/common/config.prod.php b/app/private/common/config.prod.php
similarity index 80%
rename from private/common/config.prod.php
rename to app/private/common/config.prod.php
index 322e802..6460d22 100644
--- a/private/common/config.prod.php
+++ b/app/private/common/config.prod.php
@@ -22,10 +22,10 @@ $database->useAuth = true;
 $database->connectionString = "mongodb://".$database->user.":".$database->pass."@localhost/".$database->dbName;
 
 $currentSystem = new stdClass();
-$currentSystem->storageBaseDir 		= "/home/asdynamics/storage";				// Il path con storage ecc in cui mettere immagini, file temporanei ecc
-$currentSystem->privateBaseDir		= "/home/asdynamics/private";	// Il path in cui inserire la cartella con lib, task, binari ecc
-$currentSystem->tmpBaseDir			= "/tmp/asdynamics";
-$currentSystem->logBaseDir 			= "/var/log/asdynamics";			// Il path dei log....
+$currentSystem->storageBaseDir 		= "/home/ddninja/storage";				// Il path con storage ecc in cui mettere immagini, file temporanei ecc
+$currentSystem->privateBaseDir		= "/home/ddninja/private";	// Il path in cui inserire la cartella con lib, task, binari ecc
+$currentSystem->tmpBaseDir			= "/tmp/ddninja";
+$currentSystem->logBaseDir 			= "/var/log/ddninja";			// Il path dei log....
 $currentSystem->xSendFileDir		= "/tmp/xsend";
 
 // $currentSystem->safeStorage			= "/home/cbs/storage";
diff --git a/private/common/config.test.php b/app/private/common/config.test.php
similarity index 91%
rename from private/common/config.test.php
rename to app/private/common/config.test.php
index 237e5f3..9b53d18 100644
--- a/private/common/config.test.php
+++ b/app/private/common/config.test.php
@@ -20,8 +20,8 @@ $database->connectionString = "mongodb://".$database->user.":".$database->pass."
 
 $currentSystem = new stdClass();
 $currentSystem->storageBaseDir 		= "/home";				// Il path con storage ecc in cui mettere immagini, file temporanei ecc
-$currentSystem->privateBaseDir		= "/home/asdynamics";	// Il path in cui inserire la cartella con lib, task, binari ecc
-$currentSystem->tmpBaseDir			= "/tmp/asdynamics";
+$currentSystem->privateBaseDir		= "/home/ddninja";	// Il path in cui inserire la cartella con lib, task, binari ecc
+$currentSystem->tmpBaseDir			= "/tmp/ddninja";
 $currentSystem->logBaseDir 			= "/var/log";			// Il path dei log....
 $currentSystem->xSendFileDir		= "/tmp/xsend";
 
diff --git a/private/common/id_rsa_cbs.pub b/app/private/common/id_rsa_cbs.pub
similarity index 100%
rename from private/common/id_rsa_cbs.pub
rename to app/private/common/id_rsa_cbs.pub
diff --git a/private/common/id_rsa_cbs_prod b/app/private/common/id_rsa_cbs_prod
similarity index 100%
rename from private/common/id_rsa_cbs_prod
rename to app/private/common/id_rsa_cbs_prod
diff --git a/private/lib/AnalyticsHelper.php b/app/private/lib/AnalyticsHelper.php
similarity index 100%
rename from private/lib/AnalyticsHelper.php
rename to app/private/lib/AnalyticsHelper.php
diff --git a/private/lib/BannerHelper.php b/app/private/lib/BannerHelper.php
similarity index 100%
rename from private/lib/BannerHelper.php
rename to app/private/lib/BannerHelper.php
diff --git a/private/lib/CataloguedException.php b/app/private/lib/CataloguedException.php
similarity index 100%
rename from private/lib/CataloguedException.php
rename to app/private/lib/CataloguedException.php
diff --git a/private/lib/CoreException.php b/app/private/lib/CoreException.php
similarity index 100%
rename from private/lib/CoreException.php
rename to app/private/lib/CoreException.php
diff --git a/private/lib/FDN_MailHelper.php b/app/private/lib/FDN_MailHelper.php
similarity index 100%
rename from private/lib/FDN_MailHelper.php
rename to app/private/lib/FDN_MailHelper.php
diff --git a/private/lib/GlobalVariables.php b/app/private/lib/GlobalVariables.php
similarity index 100%
rename from private/lib/GlobalVariables.php
rename to app/private/lib/GlobalVariables.php
diff --git a/private/lib/MultimessageException.php b/app/private/lib/MultimessageException.php
similarity index 100%
rename from private/lib/MultimessageException.php
rename to app/private/lib/MultimessageException.php
diff --git a/private/lib/PipelineHelper.php b/app/private/lib/PipelineHelper.php
similarity index 100%
rename from private/lib/PipelineHelper.php
rename to app/private/lib/PipelineHelper.php
diff --git a/private/lib/RSSHelper.php b/app/private/lib/RSSHelper.php
similarity index 100%
rename from private/lib/RSSHelper.php
rename to app/private/lib/RSSHelper.php
diff --git a/private/lib/backup/FDN2CBS_DataStorage.php b/app/private/lib/backup/FDN2CBS_DataStorage.php
similarity index 100%
rename from private/lib/backup/FDN2CBS_DataStorage.php
rename to app/private/lib/backup/FDN2CBS_DataStorage.php
diff --git a/private/lib/backup/FDN2CBS_Logger.php b/app/private/lib/backup/FDN2CBS_Logger.php
similarity index 100%
rename from private/lib/backup/FDN2CBS_Logger.php
rename to app/private/lib/backup/FDN2CBS_Logger.php
diff --git a/private/lib/backup/cbsClient/CBSClient.php b/app/private/lib/backup/cbsClient/CBSClient.php
similarity index 100%
rename from private/lib/backup/cbsClient/CBSClient.php
rename to app/private/lib/backup/cbsClient/CBSClient.php
diff --git a/private/lib/backup/cbsClient/CBSClient_DataStorageBase.php b/app/private/lib/backup/cbsClient/CBSClient_DataStorageBase.php
similarity index 100%
rename from private/lib/backup/cbsClient/CBSClient_DataStorageBase.php
rename to app/private/lib/backup/cbsClient/CBSClient_DataStorageBase.php
diff --git a/private/lib/backup/cbsClient/CBS_RAPIClientImplementation.php b/app/private/lib/backup/cbsClient/CBS_RAPIClientImplementation.php
similarity index 100%
rename from private/lib/backup/cbsClient/CBS_RAPIClientImplementation.php
rename to app/private/lib/backup/cbsClient/CBS_RAPIClientImplementation.php
diff --git a/private/lib/backup/cbsClient/cbs.client.include.php b/app/private/lib/backup/cbsClient/cbs.client.include.php
similarity index 100%
rename from private/lib/backup/cbsClient/cbs.client.include.php
rename to app/private/lib/backup/cbsClient/cbs.client.include.php
diff --git a/private/lib/backup/cbsClient/messages/request/RAPI_BackupListRequestDetails.php b/app/private/lib/backup/cbsClient/messages/request/RAPI_BackupListRequestDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/messages/request/RAPI_BackupListRequestDetails.php
rename to app/private/lib/backup/cbsClient/messages/request/RAPI_BackupListRequestDetails.php
diff --git a/private/lib/backup/cbsClient/messages/request/RAPI_CreateBackupRequestDetails.php b/app/private/lib/backup/cbsClient/messages/request/RAPI_CreateBackupRequestDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/messages/request/RAPI_CreateBackupRequestDetails.php
rename to app/private/lib/backup/cbsClient/messages/request/RAPI_CreateBackupRequestDetails.php
diff --git a/private/lib/backup/cbsClient/messages/request/RAPI_GetBackupRequestDetails.php b/app/private/lib/backup/cbsClient/messages/request/RAPI_GetBackupRequestDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/messages/request/RAPI_GetBackupRequestDetails.php
rename to app/private/lib/backup/cbsClient/messages/request/RAPI_GetBackupRequestDetails.php
diff --git a/private/lib/backup/cbsClient/messages/response/RAPI_BackupListResponseDetails.php b/app/private/lib/backup/cbsClient/messages/response/RAPI_BackupListResponseDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/messages/response/RAPI_BackupListResponseDetails.php
rename to app/private/lib/backup/cbsClient/messages/response/RAPI_BackupListResponseDetails.php
diff --git a/private/lib/backup/cbsClient/messages/response/RAPI_CreateBackupResponseDetails.php b/app/private/lib/backup/cbsClient/messages/response/RAPI_CreateBackupResponseDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/messages/response/RAPI_CreateBackupResponseDetails.php
rename to app/private/lib/backup/cbsClient/messages/response/RAPI_CreateBackupResponseDetails.php
diff --git a/private/lib/backup/cbsClient/messages/response/RAPI_GetBackupResponseDetails.php b/app/private/lib/backup/cbsClient/messages/response/RAPI_GetBackupResponseDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/messages/response/RAPI_GetBackupResponseDetails.php
rename to app/private/lib/backup/cbsClient/messages/response/RAPI_GetBackupResponseDetails.php
diff --git a/private/lib/backup/cbsClient/rapi/RAPI_Config.php b/app/private/lib/backup/cbsClient/rapi/RAPI_Config.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/RAPI_Config.php
rename to app/private/lib/backup/cbsClient/rapi/RAPI_Config.php
diff --git a/private/lib/backup/cbsClient/rapi/RAPI_CryptUtils.php b/app/private/lib/backup/cbsClient/rapi/RAPI_CryptUtils.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/RAPI_CryptUtils.php
rename to app/private/lib/backup/cbsClient/rapi/RAPI_CryptUtils.php
diff --git a/private/lib/backup/cbsClient/rapi/RAPI_Logger.php b/app/private/lib/backup/cbsClient/rapi/RAPI_Logger.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/RAPI_Logger.php
rename to app/private/lib/backup/cbsClient/rapi/RAPI_Logger.php
diff --git a/private/lib/backup/cbsClient/rapi/exceptions/RAPI_Exception.php b/app/private/lib/backup/cbsClient/rapi/exceptions/RAPI_Exception.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/exceptions/RAPI_Exception.php
rename to app/private/lib/backup/cbsClient/rapi/exceptions/RAPI_Exception.php
diff --git a/private/lib/backup/cbsClient/rapi/exceptions/RAPI_ValidationException.php b/app/private/lib/backup/cbsClient/rapi/exceptions/RAPI_ValidationException.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/exceptions/RAPI_ValidationException.php
rename to app/private/lib/backup/cbsClient/rapi/exceptions/RAPI_ValidationException.php
diff --git a/private/lib/backup/cbsClient/rapi/include.php b/app/private/lib/backup/cbsClient/rapi/include.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/include.php
rename to app/private/lib/backup/cbsClient/rapi/include.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/RAPI_Message.php b/app/private/lib/backup/cbsClient/rapi/messages/RAPI_Message.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/RAPI_Message.php
rename to app/private/lib/backup/cbsClient/rapi/messages/RAPI_Message.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/RAPI_MessageDetails.php b/app/private/lib/backup/cbsClient/rapi/messages/RAPI_MessageDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/RAPI_MessageDetails.php
rename to app/private/lib/backup/cbsClient/rapi/messages/RAPI_MessageDetails.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/RAPI_Request.php b/app/private/lib/backup/cbsClient/rapi/messages/RAPI_Request.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/RAPI_Request.php
rename to app/private/lib/backup/cbsClient/rapi/messages/RAPI_Request.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetails.php b/app/private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetails.php
rename to app/private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetails.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetailsFactory.php b/app/private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetailsFactory.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetailsFactory.php
rename to app/private/lib/backup/cbsClient/rapi/messages/RAPI_RequestDetailsFactory.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/RAPI_Response.php b/app/private/lib/backup/cbsClient/rapi/messages/RAPI_Response.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/RAPI_Response.php
rename to app/private/lib/backup/cbsClient/rapi/messages/RAPI_Response.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/RAPI_ResponseDetails.php b/app/private/lib/backup/cbsClient/rapi/messages/RAPI_ResponseDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/RAPI_ResponseDetails.php
rename to app/private/lib/backup/cbsClient/rapi/messages/RAPI_ResponseDetails.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequest.php b/app/private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequest.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequest.php
rename to app/private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequest.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequestDetails.php b/app/private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequestDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequestDetails.php
rename to app/private/lib/backup/cbsClient/rapi/messages/request/RAPI_UnreadableRequestDetails.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/response/RAPI_EmptyResponseDetails.php b/app/private/lib/backup/cbsClient/rapi/messages/response/RAPI_EmptyResponseDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/response/RAPI_EmptyResponseDetails.php
rename to app/private/lib/backup/cbsClient/rapi/messages/response/RAPI_EmptyResponseDetails.php
diff --git a/private/lib/backup/cbsClient/rapi/messages/response/RAPI_SimpleMessageResponseDetails.php b/app/private/lib/backup/cbsClient/rapi/messages/response/RAPI_SimpleMessageResponseDetails.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/messages/response/RAPI_SimpleMessageResponseDetails.php
rename to app/private/lib/backup/cbsClient/rapi/messages/response/RAPI_SimpleMessageResponseDetails.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_Client.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_Client.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/RAPI_Client.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_Client.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientException.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientException.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientException.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientException.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientHelper.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientHelper.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientHelper.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_ClientHelper.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_DataStorage.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_DataStorage.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/RAPI_DataStorage.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/RAPI_DataStorage.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/client_include.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/client_include.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/client_include.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/client_include.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_ResponseFetcher.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_ResponseFetcher.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_ResponseFetcher.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_ResponseFetcher.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_SingleValueResponseFetcher.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_SingleValueResponseFetcher.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_SingleValueResponseFetcher.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_SingleValueResponseFetcher.php
diff --git a/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_StandardResponseFetcher.php b/app/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_StandardResponseFetcher.php
similarity index 100%
rename from private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_StandardResponseFetcher.php
rename to app/private/lib/backup/cbsClient/rapi/rapi_client/request_helper/RAPI_StandardResponseFetcher.php
diff --git a/private/lib/backup/lib.inclusion.php b/app/private/lib/backup/lib.inclusion.php
similarity index 100%
rename from private/lib/backup/lib.inclusion.php
rename to app/private/lib/backup/lib.inclusion.php
diff --git a/private/lib/constrained/Constrained.php b/app/private/lib/constrained/Constrained.php
similarity index 100%
rename from private/lib/constrained/Constrained.php
rename to app/private/lib/constrained/Constrained.php
diff --git a/private/lib/constrained/ConstrainedArrayObject.php b/app/private/lib/constrained/ConstrainedArrayObject.php
similarity index 100%
rename from private/lib/constrained/ConstrainedArrayObject.php
rename to app/private/lib/constrained/ConstrainedArrayObject.php
diff --git a/private/lib/constrained/ConstrainedBehaviour.php b/app/private/lib/constrained/ConstrainedBehaviour.php
similarity index 100%
rename from private/lib/constrained/ConstrainedBehaviour.php
rename to app/private/lib/constrained/ConstrainedBehaviour.php
diff --git a/private/lib/constrained/ConstrainedFactory.php b/app/private/lib/constrained/ConstrainedFactory.php
similarity index 100%
rename from private/lib/constrained/ConstrainedFactory.php
rename to app/private/lib/constrained/ConstrainedFactory.php
diff --git a/private/lib/constrained/ConstrainedInterface.php b/app/private/lib/constrained/ConstrainedInterface.php
similarity index 100%
rename from private/lib/constrained/ConstrainedInterface.php
rename to app/private/lib/constrained/ConstrainedInterface.php
diff --git a/private/lib/constrained/ConstrainedMemoryObject.php b/app/private/lib/constrained/ConstrainedMemoryObject.php
similarity index 100%
rename from private/lib/constrained/ConstrainedMemoryObject.php
rename to app/private/lib/constrained/ConstrainedMemoryObject.php
diff --git a/private/lib/constrained/ConstrainedObject.php b/app/private/lib/constrained/ConstrainedObject.php
similarity index 100%
rename from private/lib/constrained/ConstrainedObject.php
rename to app/private/lib/constrained/ConstrainedObject.php
diff --git a/private/lib/constrained/ConstraintException.php b/app/private/lib/constrained/ConstraintException.php
similarity index 100%
rename from private/lib/constrained/ConstraintException.php
rename to app/private/lib/constrained/ConstraintException.php
diff --git a/private/lib/constrained/lib.inclusion.php b/app/private/lib/constrained/lib.inclusion.php
similarity index 100%
rename from private/lib/constrained/lib.inclusion.php
rename to app/private/lib/constrained/lib.inclusion.php
diff --git a/private/lib/dao/DaoSaveableDefaultImplementation.php b/app/private/lib/dao/DaoSaveableDefaultImplementation.php
similarity index 100%
rename from private/lib/dao/DaoSaveableDefaultImplementation.php
rename to app/private/lib/dao/DaoSaveableDefaultImplementation.php
diff --git a/private/lib/dao/DaoSaveableInterface.php b/app/private/lib/dao/DaoSaveableInterface.php
similarity index 100%
rename from private/lib/dao/DaoSaveableInterface.php
rename to app/private/lib/dao/DaoSaveableInterface.php
diff --git a/private/lib/dao/DaoSearchable.php b/app/private/lib/dao/DaoSearchable.php
similarity index 100%
rename from private/lib/dao/DaoSearchable.php
rename to app/private/lib/dao/DaoSearchable.php
diff --git a/private/lib/dao/GenericDao.php b/app/private/lib/dao/GenericDao.php
similarity index 100%
rename from private/lib/dao/GenericDao.php
rename to app/private/lib/dao/GenericDao.php
diff --git a/private/lib/dao/Model.php b/app/private/lib/dao/Model.php
similarity index 100%
rename from private/lib/dao/Model.php
rename to app/private/lib/dao/Model.php
diff --git a/private/lib/dao/lib.inclusion.php b/app/private/lib/dao/lib.inclusion.php
similarity index 100%
rename from private/lib/dao/lib.inclusion.php
rename to app/private/lib/dao/lib.inclusion.php
diff --git a/private/lib/dao/mediaModels/DaoMediaHandler.php b/app/private/lib/dao/mediaModels/DaoMediaHandler.php
similarity index 100%
rename from private/lib/dao/mediaModels/DaoMediaHandler.php
rename to app/private/lib/dao/mediaModels/DaoMediaHandler.php
diff --git a/private/lib/dao/mediaModels/HasMediaModel.php b/app/private/lib/dao/mediaModels/HasMediaModel.php
similarity index 100%
rename from private/lib/dao/mediaModels/HasMediaModel.php
rename to app/private/lib/dao/mediaModels/HasMediaModel.php
diff --git a/private/lib/dao/mediaModels/MediaModel.php b/app/private/lib/dao/mediaModels/MediaModel.php
similarity index 100%
rename from private/lib/dao/mediaModels/MediaModel.php
rename to app/private/lib/dao/mediaModels/MediaModel.php
diff --git a/private/lib/dao/models/AccessModel.php b/app/private/lib/dao/models/AccessModel.php
similarity index 100%
rename from private/lib/dao/models/AccessModel.php
rename to app/private/lib/dao/models/AccessModel.php
diff --git a/private/lib/dao/models/AdminModel.php b/app/private/lib/dao/models/AdminModel.php
similarity index 100%
rename from private/lib/dao/models/AdminModel.php
rename to app/private/lib/dao/models/AdminModel.php
diff --git a/private/lib/dao/models/BannerModel.php b/app/private/lib/dao/models/BannerModel.php
similarity index 100%
rename from private/lib/dao/models/BannerModel.php
rename to app/private/lib/dao/models/BannerModel.php
diff --git a/private/lib/dao/models/CBSQueueModel.php b/app/private/lib/dao/models/CBSQueueModel.php
similarity index 100%
rename from private/lib/dao/models/CBSQueueModel.php
rename to app/private/lib/dao/models/CBSQueueModel.php
diff --git a/private/lib/dao/models/CommentoModel.php b/app/private/lib/dao/models/CommentoModel.php
similarity index 100%
rename from private/lib/dao/models/CommentoModel.php
rename to app/private/lib/dao/models/CommentoModel.php
diff --git a/private/lib/dao/models/ConfigModel.php b/app/private/lib/dao/models/ConfigModel.php
similarity index 100%
rename from private/lib/dao/models/ConfigModel.php
rename to app/private/lib/dao/models/ConfigModel.php
diff --git a/private/lib/dao/models/LogModel.php b/app/private/lib/dao/models/LogModel.php
similarity index 100%
rename from private/lib/dao/models/LogModel.php
rename to app/private/lib/dao/models/LogModel.php
diff --git a/private/lib/dao/models/MailModel.php b/app/private/lib/dao/models/MailModel.php
similarity index 100%
rename from private/lib/dao/models/MailModel.php
rename to app/private/lib/dao/models/MailModel.php
diff --git a/private/lib/dao/models/MailTemplateModel.php b/app/private/lib/dao/models/MailTemplateModel.php
similarity index 100%
rename from private/lib/dao/models/MailTemplateModel.php
rename to app/private/lib/dao/models/MailTemplateModel.php
diff --git a/private/lib/dao/models/NotiziaModel.php b/app/private/lib/dao/models/NotiziaModel.php
similarity index 100%
rename from private/lib/dao/models/NotiziaModel.php
rename to app/private/lib/dao/models/NotiziaModel.php
diff --git a/private/lib/dao/models/PasswordRecoveryRequestModel.php b/app/private/lib/dao/models/PasswordRecoveryRequestModel.php
similarity index 100%
rename from private/lib/dao/models/PasswordRecoveryRequestModel.php
rename to app/private/lib/dao/models/PasswordRecoveryRequestModel.php
diff --git a/private/lib/dao/models/StatisticModel.php b/app/private/lib/dao/models/StatisticModel.php
similarity index 100%
rename from private/lib/dao/models/StatisticModel.php
rename to app/private/lib/dao/models/StatisticModel.php
diff --git a/private/lib/dao/models/TaskModel.php b/app/private/lib/dao/models/TaskModel.php
similarity index 100%
rename from private/lib/dao/models/TaskModel.php
rename to app/private/lib/dao/models/TaskModel.php
diff --git a/private/lib/dao/models/UserModel.php b/app/private/lib/dao/models/UserModel.php
similarity index 100%
rename from private/lib/dao/models/UserModel.php
rename to app/private/lib/dao/models/UserModel.php
diff --git a/private/lib/gui/ASDSessionHandler.php b/app/private/lib/gui/ASDSessionHandler.php
similarity index 100%
rename from private/lib/gui/ASDSessionHandler.php
rename to app/private/lib/gui/ASDSessionHandler.php
diff --git a/private/lib/gui/CatalogManager.php b/app/private/lib/gui/CatalogManager.php
similarity index 100%
rename from private/lib/gui/CatalogManager.php
rename to app/private/lib/gui/CatalogManager.php
diff --git a/private/lib/gui/DatatablesHelper.php b/app/private/lib/gui/DatatablesHelper.php
similarity index 100%
rename from private/lib/gui/DatatablesHelper.php
rename to app/private/lib/gui/DatatablesHelper.php
diff --git a/private/lib/gui/FDN2Components.php b/app/private/lib/gui/FDN2Components.php
similarity index 100%
rename from private/lib/gui/FDN2Components.php
rename to app/private/lib/gui/FDN2Components.php
diff --git a/private/lib/gui/GUIException.php b/app/private/lib/gui/GUIException.php
similarity index 100%
rename from private/lib/gui/GUIException.php
rename to app/private/lib/gui/GUIException.php
diff --git a/private/lib/gui/GUIHandler.php b/app/private/lib/gui/GUIHandler.php
similarity index 100%
rename from private/lib/gui/GUIHandler.php
rename to app/private/lib/gui/GUIHandler.php
diff --git a/private/lib/gui/GUIHandlerMobile.php b/app/private/lib/gui/GUIHandlerMobile.php
similarity index 100%
rename from private/lib/gui/GUIHandlerMobile.php
rename to app/private/lib/gui/GUIHandlerMobile.php
diff --git a/private/lib/gui/HTMLHelper.php b/app/private/lib/gui/HTMLHelper.php
similarity index 100%
rename from private/lib/gui/HTMLHelper.php
rename to app/private/lib/gui/HTMLHelper.php
diff --git a/private/lib/gui/ImageCacheManager.php b/app/private/lib/gui/ImageCacheManager.php
similarity index 100%
rename from private/lib/gui/ImageCacheManager.php
rename to app/private/lib/gui/ImageCacheManager.php
diff --git a/private/lib/gui/MenuGenerator.php b/app/private/lib/gui/MenuGenerator.php
similarity index 100%
rename from private/lib/gui/MenuGenerator.php
rename to app/private/lib/gui/MenuGenerator.php
diff --git a/private/lib/gui/PostHandler.php b/app/private/lib/gui/PostHandler.php
similarity index 100%
rename from private/lib/gui/PostHandler.php
rename to app/private/lib/gui/PostHandler.php
diff --git a/private/lib/gui/StaticCatalogManager.php b/app/private/lib/gui/StaticCatalogManager.php
similarity index 100%
rename from private/lib/gui/StaticCatalogManager.php
rename to app/private/lib/gui/StaticCatalogManager.php
diff --git a/private/lib/gui/html.inclusion.php b/app/private/lib/gui/html.inclusion.php
similarity index 100%
rename from private/lib/gui/html.inclusion.php
rename to app/private/lib/gui/html.inclusion.php
diff --git a/private/lib/gui/lib.inclusion.php b/app/private/lib/gui/lib.inclusion.php
similarity index 100%
rename from private/lib/gui/lib.inclusion.php
rename to app/private/lib/gui/lib.inclusion.php
diff --git a/private/lib/gui/loginManager/AdminLoginManager.php b/app/private/lib/gui/loginManager/AdminLoginManager.php
similarity index 100%
rename from private/lib/gui/loginManager/AdminLoginManager.php
rename to app/private/lib/gui/loginManager/AdminLoginManager.php
diff --git a/private/lib/gui/loginManager/LoginManager.php b/app/private/lib/gui/loginManager/LoginManager.php
similarity index 100%
rename from private/lib/gui/loginManager/LoginManager.php
rename to app/private/lib/gui/loginManager/LoginManager.php
diff --git a/private/lib/gui/loginManager/UserLoginManager.php b/app/private/lib/gui/loginManager/UserLoginManager.php
similarity index 100%
rename from private/lib/gui/loginManager/UserLoginManager.php
rename to app/private/lib/gui/loginManager/UserLoginManager.php
diff --git a/private/lib/lib.inclusions.php b/app/private/lib/lib.inclusions.php
similarity index 100%
rename from private/lib/lib.inclusions.php
rename to app/private/lib/lib.inclusions.php
diff --git a/private/lib/lib.instances.php b/app/private/lib/lib.instances.php
similarity index 100%
rename from private/lib/lib.instances.php
rename to app/private/lib/lib.instances.php
diff --git a/private/lib/logger/FileLogger.php b/app/private/lib/logger/FileLogger.php
similarity index 100%
rename from private/lib/logger/FileLogger.php
rename to app/private/lib/logger/FileLogger.php
diff --git a/private/lib/logger/LoggingFacility.php b/app/private/lib/logger/LoggingFacility.php
similarity index 100%
rename from private/lib/logger/LoggingFacility.php
rename to app/private/lib/logger/LoggingFacility.php
diff --git a/private/lib/logger/LoggingFacilityManager.php b/app/private/lib/logger/LoggingFacilityManager.php
similarity index 100%
rename from private/lib/logger/LoggingFacilityManager.php
rename to app/private/lib/logger/LoggingFacilityManager.php
diff --git a/private/lib/logger/SyslogLogger.php b/app/private/lib/logger/SyslogLogger.php
similarity index 100%
rename from private/lib/logger/SyslogLogger.php
rename to app/private/lib/logger/SyslogLogger.php
diff --git a/private/lib/logger/lib.inclusion.php b/app/private/lib/logger/lib.inclusion.php
similarity index 100%
rename from private/lib/logger/lib.inclusion.php
rename to app/private/lib/logger/lib.inclusion.php
diff --git a/private/lib/mail/FDN_MailInterface.php b/app/private/lib/mail/FDN_MailInterface.php
similarity index 100%
rename from private/lib/mail/FDN_MailInterface.php
rename to app/private/lib/mail/FDN_MailInterface.php
diff --git a/private/lib/mail/FDN_Mailer.php b/app/private/lib/mail/FDN_Mailer.php
similarity index 100%
rename from private/lib/mail/FDN_Mailer.php
rename to app/private/lib/mail/FDN_Mailer.php
diff --git a/private/lib/mail/PHP_Mailer/LICENSE b/app/private/lib/mail/PHP_Mailer/LICENSE
similarity index 100%
rename from private/lib/mail/PHP_Mailer/LICENSE
rename to app/private/lib/mail/PHP_Mailer/LICENSE
diff --git a/private/lib/mail/PHP_Mailer/PHPMailerAutoload.php b/app/private/lib/mail/PHP_Mailer/PHPMailerAutoload.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/PHPMailerAutoload.php
rename to app/private/lib/mail/PHP_Mailer/PHPMailerAutoload.php
diff --git a/private/lib/mail/PHP_Mailer/README.md b/app/private/lib/mail/PHP_Mailer/README.md
similarity index 100%
rename from private/lib/mail/PHP_Mailer/README.md
rename to app/private/lib/mail/PHP_Mailer/README.md
diff --git a/private/lib/mail/PHP_Mailer/VERSION b/app/private/lib/mail/PHP_Mailer/VERSION
similarity index 100%
rename from private/lib/mail/PHP_Mailer/VERSION
rename to app/private/lib/mail/PHP_Mailer/VERSION
diff --git a/private/lib/mail/PHP_Mailer/changelog.md b/app/private/lib/mail/PHP_Mailer/changelog.md
similarity index 100%
rename from private/lib/mail/PHP_Mailer/changelog.md
rename to app/private/lib/mail/PHP_Mailer/changelog.md
diff --git a/private/lib/mail/PHP_Mailer/class.phpmailer.php b/app/private/lib/mail/PHP_Mailer/class.phpmailer.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/class.phpmailer.php
rename to app/private/lib/mail/PHP_Mailer/class.phpmailer.php
diff --git a/private/lib/mail/PHP_Mailer/class.phpmaileroauth.php b/app/private/lib/mail/PHP_Mailer/class.phpmaileroauth.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/class.phpmaileroauth.php
rename to app/private/lib/mail/PHP_Mailer/class.phpmaileroauth.php
diff --git a/private/lib/mail/PHP_Mailer/class.phpmaileroauthgoogle.php b/app/private/lib/mail/PHP_Mailer/class.phpmaileroauthgoogle.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/class.phpmaileroauthgoogle.php
rename to app/private/lib/mail/PHP_Mailer/class.phpmaileroauthgoogle.php
diff --git a/private/lib/mail/PHP_Mailer/class.pop3.php b/app/private/lib/mail/PHP_Mailer/class.pop3.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/class.pop3.php
rename to app/private/lib/mail/PHP_Mailer/class.pop3.php
diff --git a/private/lib/mail/PHP_Mailer/class.smtp.php b/app/private/lib/mail/PHP_Mailer/class.smtp.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/class.smtp.php
rename to app/private/lib/mail/PHP_Mailer/class.smtp.php
diff --git a/private/lib/mail/PHP_Mailer/composer.json b/app/private/lib/mail/PHP_Mailer/composer.json
similarity index 100%
rename from private/lib/mail/PHP_Mailer/composer.json
rename to app/private/lib/mail/PHP_Mailer/composer.json
diff --git a/private/lib/mail/PHP_Mailer/composer.lock b/app/private/lib/mail/PHP_Mailer/composer.lock
similarity index 100%
rename from private/lib/mail/PHP_Mailer/composer.lock
rename to app/private/lib/mail/PHP_Mailer/composer.lock
diff --git a/private/lib/mail/PHP_Mailer/docs/Callback_function_notes.txt b/app/private/lib/mail/PHP_Mailer/docs/Callback_function_notes.txt
similarity index 100%
rename from private/lib/mail/PHP_Mailer/docs/Callback_function_notes.txt
rename to app/private/lib/mail/PHP_Mailer/docs/Callback_function_notes.txt
diff --git a/private/lib/mail/PHP_Mailer/docs/DomainKeys_notes.txt b/app/private/lib/mail/PHP_Mailer/docs/DomainKeys_notes.txt
similarity index 100%
rename from private/lib/mail/PHP_Mailer/docs/DomainKeys_notes.txt
rename to app/private/lib/mail/PHP_Mailer/docs/DomainKeys_notes.txt
diff --git a/private/lib/mail/PHP_Mailer/docs/Note_for_SMTP_debugging.txt b/app/private/lib/mail/PHP_Mailer/docs/Note_for_SMTP_debugging.txt
similarity index 100%
rename from private/lib/mail/PHP_Mailer/docs/Note_for_SMTP_debugging.txt
rename to app/private/lib/mail/PHP_Mailer/docs/Note_for_SMTP_debugging.txt
diff --git a/private/lib/mail/PHP_Mailer/docs/extending.html b/app/private/lib/mail/PHP_Mailer/docs/extending.html
similarity index 100%
rename from private/lib/mail/PHP_Mailer/docs/extending.html
rename to app/private/lib/mail/PHP_Mailer/docs/extending.html
diff --git a/private/lib/mail/PHP_Mailer/docs/faq.html b/app/private/lib/mail/PHP_Mailer/docs/faq.html
similarity index 100%
rename from private/lib/mail/PHP_Mailer/docs/faq.html
rename to app/private/lib/mail/PHP_Mailer/docs/faq.html
diff --git a/private/lib/mail/PHP_Mailer/docs/generatedocs.sh b/app/private/lib/mail/PHP_Mailer/docs/generatedocs.sh
similarity index 100%
rename from private/lib/mail/PHP_Mailer/docs/generatedocs.sh
rename to app/private/lib/mail/PHP_Mailer/docs/generatedocs.sh
diff --git a/private/lib/mail/PHP_Mailer/docs/pop3_article.txt b/app/private/lib/mail/PHP_Mailer/docs/pop3_article.txt
similarity index 100%
rename from private/lib/mail/PHP_Mailer/docs/pop3_article.txt
rename to app/private/lib/mail/PHP_Mailer/docs/pop3_article.txt
diff --git a/private/lib/mail/PHP_Mailer/examples/code_generator.phps b/app/private/lib/mail/PHP_Mailer/examples/code_generator.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/code_generator.phps
rename to app/private/lib/mail/PHP_Mailer/examples/code_generator.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/contents.html b/app/private/lib/mail/PHP_Mailer/examples/contents.html
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/contents.html
rename to app/private/lib/mail/PHP_Mailer/examples/contents.html
diff --git a/private/lib/mail/PHP_Mailer/examples/contentsutf8.html b/app/private/lib/mail/PHP_Mailer/examples/contentsutf8.html
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/contentsutf8.html
rename to app/private/lib/mail/PHP_Mailer/examples/contentsutf8.html
diff --git a/private/lib/mail/PHP_Mailer/examples/exceptions.phps b/app/private/lib/mail/PHP_Mailer/examples/exceptions.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/exceptions.phps
rename to app/private/lib/mail/PHP_Mailer/examples/exceptions.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/gmail.phps b/app/private/lib/mail/PHP_Mailer/examples/gmail.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/gmail.phps
rename to app/private/lib/mail/PHP_Mailer/examples/gmail.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/gmail_xoauth.phps b/app/private/lib/mail/PHP_Mailer/examples/gmail_xoauth.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/gmail_xoauth.phps
rename to app/private/lib/mail/PHP_Mailer/examples/gmail_xoauth.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/images/phpmailer.png b/app/private/lib/mail/PHP_Mailer/examples/images/phpmailer.png
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/images/phpmailer.png
rename to app/private/lib/mail/PHP_Mailer/examples/images/phpmailer.png
diff --git a/private/lib/mail/PHP_Mailer/examples/images/phpmailer_mini.png b/app/private/lib/mail/PHP_Mailer/examples/images/phpmailer_mini.png
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/images/phpmailer_mini.png
rename to app/private/lib/mail/PHP_Mailer/examples/images/phpmailer_mini.png
diff --git a/private/lib/mail/PHP_Mailer/examples/index.html b/app/private/lib/mail/PHP_Mailer/examples/index.html
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/index.html
rename to app/private/lib/mail/PHP_Mailer/examples/index.html
diff --git a/private/lib/mail/PHP_Mailer/examples/mail.phps b/app/private/lib/mail/PHP_Mailer/examples/mail.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/mail.phps
rename to app/private/lib/mail/PHP_Mailer/examples/mail.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/mailing_list.phps b/app/private/lib/mail/PHP_Mailer/examples/mailing_list.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/mailing_list.phps
rename to app/private/lib/mail/PHP_Mailer/examples/mailing_list.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/pop_before_smtp.phps b/app/private/lib/mail/PHP_Mailer/examples/pop_before_smtp.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/pop_before_smtp.phps
rename to app/private/lib/mail/PHP_Mailer/examples/pop_before_smtp.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/scripts/XRegExp.js b/app/private/lib/mail/PHP_Mailer/examples/scripts/XRegExp.js
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/scripts/XRegExp.js
rename to app/private/lib/mail/PHP_Mailer/examples/scripts/XRegExp.js
diff --git a/private/lib/mail/PHP_Mailer/examples/scripts/shAutoloader.js b/app/private/lib/mail/PHP_Mailer/examples/scripts/shAutoloader.js
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/scripts/shAutoloader.js
rename to app/private/lib/mail/PHP_Mailer/examples/scripts/shAutoloader.js
diff --git a/private/lib/mail/PHP_Mailer/examples/scripts/shBrushPhp.js b/app/private/lib/mail/PHP_Mailer/examples/scripts/shBrushPhp.js
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/scripts/shBrushPhp.js
rename to app/private/lib/mail/PHP_Mailer/examples/scripts/shBrushPhp.js
diff --git a/private/lib/mail/PHP_Mailer/examples/scripts/shCore.js b/app/private/lib/mail/PHP_Mailer/examples/scripts/shCore.js
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/scripts/shCore.js
rename to app/private/lib/mail/PHP_Mailer/examples/scripts/shCore.js
diff --git a/private/lib/mail/PHP_Mailer/examples/scripts/shLegacy.js b/app/private/lib/mail/PHP_Mailer/examples/scripts/shLegacy.js
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/scripts/shLegacy.js
rename to app/private/lib/mail/PHP_Mailer/examples/scripts/shLegacy.js
diff --git a/private/lib/mail/PHP_Mailer/examples/send_file_upload.phps b/app/private/lib/mail/PHP_Mailer/examples/send_file_upload.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/send_file_upload.phps
rename to app/private/lib/mail/PHP_Mailer/examples/send_file_upload.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/sendmail.phps b/app/private/lib/mail/PHP_Mailer/examples/sendmail.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/sendmail.phps
rename to app/private/lib/mail/PHP_Mailer/examples/sendmail.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/signed-mail.phps b/app/private/lib/mail/PHP_Mailer/examples/signed-mail.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/signed-mail.phps
rename to app/private/lib/mail/PHP_Mailer/examples/signed-mail.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/smtp.phps b/app/private/lib/mail/PHP_Mailer/examples/smtp.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/smtp.phps
rename to app/private/lib/mail/PHP_Mailer/examples/smtp.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/smtp_check.phps b/app/private/lib/mail/PHP_Mailer/examples/smtp_check.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/smtp_check.phps
rename to app/private/lib/mail/PHP_Mailer/examples/smtp_check.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/smtp_no_auth.phps b/app/private/lib/mail/PHP_Mailer/examples/smtp_no_auth.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/smtp_no_auth.phps
rename to app/private/lib/mail/PHP_Mailer/examples/smtp_no_auth.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/ssl_options.phps b/app/private/lib/mail/PHP_Mailer/examples/ssl_options.phps
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/ssl_options.phps
rename to app/private/lib/mail/PHP_Mailer/examples/ssl_options.phps
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCore.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCore.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCore.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCore.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreDefault.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreDefault.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreDefault.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreDefault.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreDjango.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreDjango.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreDjango.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreDjango.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreEclipse.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreEclipse.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreEclipse.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreEclipse.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreEmacs.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreEmacs.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreEmacs.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreEmacs.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreFadeToGrey.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreFadeToGrey.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreFadeToGrey.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreFadeToGrey.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreMDUltra.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreMDUltra.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreMDUltra.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreMDUltra.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreMidnight.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreMidnight.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreMidnight.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreMidnight.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shCoreRDark.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shCoreRDark.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shCoreRDark.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shCoreRDark.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeAppleScript.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeAppleScript.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeAppleScript.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeAppleScript.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeDefault.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeDefault.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeDefault.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeDefault.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeDjango.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeDjango.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeDjango.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeDjango.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeEclipse.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeEclipse.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeEclipse.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeEclipse.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeEmacs.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeEmacs.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeEmacs.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeEmacs.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeFadeToGrey.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeFadeToGrey.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeFadeToGrey.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeFadeToGrey.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeMDUltra.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeMDUltra.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeMDUltra.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeMDUltra.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeMidnight.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeMidnight.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeMidnight.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeMidnight.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeRDark.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeRDark.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeRDark.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeRDark.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/shThemeVisualStudio.css b/app/private/lib/mail/PHP_Mailer/examples/styles/shThemeVisualStudio.css
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/shThemeVisualStudio.css
rename to app/private/lib/mail/PHP_Mailer/examples/styles/shThemeVisualStudio.css
diff --git a/private/lib/mail/PHP_Mailer/examples/styles/wrapping.png b/app/private/lib/mail/PHP_Mailer/examples/styles/wrapping.png
similarity index 100%
rename from private/lib/mail/PHP_Mailer/examples/styles/wrapping.png
rename to app/private/lib/mail/PHP_Mailer/examples/styles/wrapping.png
diff --git a/private/lib/mail/PHP_Mailer/extras/EasyPeasyICS.php b/app/private/lib/mail/PHP_Mailer/extras/EasyPeasyICS.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/extras/EasyPeasyICS.php
rename to app/private/lib/mail/PHP_Mailer/extras/EasyPeasyICS.php
diff --git a/private/lib/mail/PHP_Mailer/extras/README.md b/app/private/lib/mail/PHP_Mailer/extras/README.md
similarity index 100%
rename from private/lib/mail/PHP_Mailer/extras/README.md
rename to app/private/lib/mail/PHP_Mailer/extras/README.md
diff --git a/private/lib/mail/PHP_Mailer/extras/htmlfilter.php b/app/private/lib/mail/PHP_Mailer/extras/htmlfilter.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/extras/htmlfilter.php
rename to app/private/lib/mail/PHP_Mailer/extras/htmlfilter.php
diff --git a/private/lib/mail/PHP_Mailer/extras/ntlm_sasl_client.php b/app/private/lib/mail/PHP_Mailer/extras/ntlm_sasl_client.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/extras/ntlm_sasl_client.php
rename to app/private/lib/mail/PHP_Mailer/extras/ntlm_sasl_client.php
diff --git a/private/lib/mail/PHP_Mailer/get_oauth_token.php b/app/private/lib/mail/PHP_Mailer/get_oauth_token.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/get_oauth_token.php
rename to app/private/lib/mail/PHP_Mailer/get_oauth_token.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-am.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-am.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-am.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-am.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ar.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ar.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ar.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ar.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-az.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-az.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-az.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-az.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-be.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-be.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-be.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-be.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-bg.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-bg.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-bg.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-bg.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-br.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-br.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-br.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-br.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ca.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ca.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ca.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ca.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ch.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ch.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ch.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ch.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-cz.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-cz.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-cz.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-cz.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-de.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-de.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-de.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-de.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-dk.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-dk.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-dk.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-dk.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-el.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-el.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-el.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-el.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-eo.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-eo.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-eo.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-eo.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-es.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-es.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-es.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-es.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-et.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-et.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-et.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-et.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fa.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fa.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-fa.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fa.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fi.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fi.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-fi.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fi.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fo.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fo.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-fo.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fo.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fr.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fr.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-fr.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-fr.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-gl.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-gl.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-gl.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-gl.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-he.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-he.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-he.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-he.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-hr.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-hr.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-hr.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-hr.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-hu.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-hu.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-hu.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-hu.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-id.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-id.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-id.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-id.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-it.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-it.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-it.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-it.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ja.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ja.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ja.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ja.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ka.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ka.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ka.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ka.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ko.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ko.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ko.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ko.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-lt.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-lt.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-lt.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-lt.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-lv.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-lv.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-lv.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-lv.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ms.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ms.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ms.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ms.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-nl.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-nl.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-nl.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-nl.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-no.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-no.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-no.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-no.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-pl.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-pl.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-pl.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-pl.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-pt.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-pt.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-pt.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-pt.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ro.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ro.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ro.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ro.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ru.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ru.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-ru.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-ru.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-se.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-se.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-se.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-se.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-si.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-si.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-si.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-si.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sk.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sk.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-sk.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sk.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sl.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sl.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-sl.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sl.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sr.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sr.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-sr.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-sr.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-tr.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-tr.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-tr.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-tr.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-uk.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-uk.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-uk.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-uk.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-vi.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-vi.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-vi.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-vi.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh.php
diff --git a/private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh_cn.php b/app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh_cn.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh_cn.php
rename to app/private/lib/mail/PHP_Mailer/language/phpmailer.lang-zh_cn.php
diff --git a/private/lib/mail/PHP_Mailer/test/bootstrap.php b/app/private/lib/mail/PHP_Mailer/test/bootstrap.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/bootstrap.php
rename to app/private/lib/mail/PHP_Mailer/test/bootstrap.php
diff --git a/private/lib/mail/PHP_Mailer/test/fakepopserver.sh b/app/private/lib/mail/PHP_Mailer/test/fakepopserver.sh
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/fakepopserver.sh
rename to app/private/lib/mail/PHP_Mailer/test/fakepopserver.sh
diff --git a/private/lib/mail/PHP_Mailer/test/fakesendmail.sh b/app/private/lib/mail/PHP_Mailer/test/fakesendmail.sh
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/fakesendmail.sh
rename to app/private/lib/mail/PHP_Mailer/test/fakesendmail.sh
diff --git a/private/lib/mail/PHP_Mailer/test/phpmailerLangTest.php b/app/private/lib/mail/PHP_Mailer/test/phpmailerLangTest.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/phpmailerLangTest.php
rename to app/private/lib/mail/PHP_Mailer/test/phpmailerLangTest.php
diff --git a/private/lib/mail/PHP_Mailer/test/phpmailerTest.php b/app/private/lib/mail/PHP_Mailer/test/phpmailerTest.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/phpmailerTest.php
rename to app/private/lib/mail/PHP_Mailer/test/phpmailerTest.php
diff --git a/private/lib/mail/PHP_Mailer/test/runfakepopserver.sh b/app/private/lib/mail/PHP_Mailer/test/runfakepopserver.sh
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/runfakepopserver.sh
rename to app/private/lib/mail/PHP_Mailer/test/runfakepopserver.sh
diff --git a/private/lib/mail/PHP_Mailer/test/test_callback.php b/app/private/lib/mail/PHP_Mailer/test/test_callback.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/test_callback.php
rename to app/private/lib/mail/PHP_Mailer/test/test_callback.php
diff --git a/private/lib/mail/PHP_Mailer/test/testbootstrap-dist.php b/app/private/lib/mail/PHP_Mailer/test/testbootstrap-dist.php
similarity index 100%
rename from private/lib/mail/PHP_Mailer/test/testbootstrap-dist.php
rename to app/private/lib/mail/PHP_Mailer/test/testbootstrap-dist.php
diff --git a/private/lib/mail/PHP_Mailer/travis.phpunit.xml.dist b/app/private/lib/mail/PHP_Mailer/travis.phpunit.xml.dist
similarity index 100%
rename from private/lib/mail/PHP_Mailer/travis.phpunit.xml.dist
rename to app/private/lib/mail/PHP_Mailer/travis.phpunit.xml.dist
diff --git a/private/lib/mail/lib.inclusion.php b/app/private/lib/mail/lib.inclusion.php
similarity index 100%
rename from private/lib/mail/lib.inclusion.php
rename to app/private/lib/mail/lib.inclusion.php
diff --git a/private/lib/media/HasMediaInterface.php b/app/private/lib/media/HasMediaInterface.php
similarity index 100%
rename from private/lib/media/HasMediaInterface.php
rename to app/private/lib/media/HasMediaInterface.php
diff --git a/private/lib/media/MediaException.php b/app/private/lib/media/MediaException.php
similarity index 100%
rename from private/lib/media/MediaException.php
rename to app/private/lib/media/MediaException.php
diff --git a/private/lib/media/MediaHandlerInterface.php b/app/private/lib/media/MediaHandlerInterface.php
similarity index 100%
rename from private/lib/media/MediaHandlerInterface.php
rename to app/private/lib/media/MediaHandlerInterface.php
diff --git a/private/lib/media/MediaInterface.php b/app/private/lib/media/MediaInterface.php
similarity index 100%
rename from private/lib/media/MediaInterface.php
rename to app/private/lib/media/MediaInterface.php
diff --git a/private/lib/media/MediaRendererInterface.php b/app/private/lib/media/MediaRendererInterface.php
similarity index 100%
rename from private/lib/media/MediaRendererInterface.php
rename to app/private/lib/media/MediaRendererInterface.php
diff --git a/private/lib/media/lib.inclusion.php b/app/private/lib/media/lib.inclusion.php
similarity index 100%
rename from private/lib/media/lib.inclusion.php
rename to app/private/lib/media/lib.inclusion.php
diff --git a/private/lib/media/mediaRenderers/MediaHtml5.php b/app/private/lib/media/mediaRenderers/MediaHtml5.php
similarity index 100%
rename from private/lib/media/mediaRenderers/MediaHtml5.php
rename to app/private/lib/media/mediaRenderers/MediaHtml5.php
diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/app/private/lib/media/mediaRenderers/MediaImage.php
similarity index 100%
rename from private/lib/media/mediaRenderers/MediaImage.php
rename to app/private/lib/media/mediaRenderers/MediaImage.php
diff --git a/private/lib/media/mediaRenderers/MediaLocalVideo.php b/app/private/lib/media/mediaRenderers/MediaLocalVideo.php
similarity index 100%
rename from private/lib/media/mediaRenderers/MediaLocalVideo.php
rename to app/private/lib/media/mediaRenderers/MediaLocalVideo.php
diff --git a/private/lib/media/mediaRenderers/MediaPdf.php b/app/private/lib/media/mediaRenderers/MediaPdf.php
similarity index 100%
rename from private/lib/media/mediaRenderers/MediaPdf.php
rename to app/private/lib/media/mediaRenderers/MediaPdf.php
diff --git a/private/lib/media/mediaRenderers/MediaRenderer.php b/app/private/lib/media/mediaRenderers/MediaRenderer.php
similarity index 100%
rename from private/lib/media/mediaRenderers/MediaRenderer.php
rename to app/private/lib/media/mediaRenderers/MediaRenderer.php
diff --git a/private/lib/media/mediaRenderers/MediaYoutube.php b/app/private/lib/media/mediaRenderers/MediaYoutube.php
similarity index 100%
rename from private/lib/media/mediaRenderers/MediaYoutube.php
rename to app/private/lib/media/mediaRenderers/MediaYoutube.php
diff --git a/private/lib/system/FSObject.php b/app/private/lib/system/FSObject.php
similarity index 100%
rename from private/lib/system/FSObject.php
rename to app/private/lib/system/FSObject.php
diff --git a/private/lib/system/SFSManager.php b/app/private/lib/system/SFSManager.php
similarity index 100%
rename from private/lib/system/SFSManager.php
rename to app/private/lib/system/SFSManager.php
diff --git a/private/lib/system/SystemController.php b/app/private/lib/system/SystemController.php
similarity index 100%
rename from private/lib/system/SystemController.php
rename to app/private/lib/system/SystemController.php
diff --git a/private/lib/system/fsobjects/LocallyMountedFS.php b/app/private/lib/system/fsobjects/LocallyMountedFS.php
similarity index 100%
rename from private/lib/system/fsobjects/LocallyMountedFS.php
rename to app/private/lib/system/fsobjects/LocallyMountedFS.php
diff --git a/private/lib/system/lib.inclusion.php b/app/private/lib/system/lib.inclusion.php
similarity index 100%
rename from private/lib/system/lib.inclusion.php
rename to app/private/lib/system/lib.inclusion.php
diff --git a/private/lib/task/DeleteOldPasswordResetRequestsTask.php b/app/private/lib/task/DeleteOldPasswordResetRequestsTask.php
similarity index 100%
rename from private/lib/task/DeleteOldPasswordResetRequestsTask.php
rename to app/private/lib/task/DeleteOldPasswordResetRequestsTask.php
diff --git a/private/lib/task/GenerateAdminActivationMailTask.php b/app/private/lib/task/GenerateAdminActivationMailTask.php
similarity index 100%
rename from private/lib/task/GenerateAdminActivationMailTask.php
rename to app/private/lib/task/GenerateAdminActivationMailTask.php
diff --git a/private/lib/task/GenerateAdminPasswordRecoveryMailTask.php b/app/private/lib/task/GenerateAdminPasswordRecoveryMailTask.php
similarity index 100%
rename from private/lib/task/GenerateAdminPasswordRecoveryMailTask.php
rename to app/private/lib/task/GenerateAdminPasswordRecoveryMailTask.php
diff --git a/private/lib/task/GenerateCommentiWarningMailTask.php b/app/private/lib/task/GenerateCommentiWarningMailTask.php
similarity index 100%
rename from private/lib/task/GenerateCommentiWarningMailTask.php
rename to app/private/lib/task/GenerateCommentiWarningMailTask.php
diff --git a/private/lib/task/GenerateUserActivationMailTask.php b/app/private/lib/task/GenerateUserActivationMailTask.php
similarity index 100%
rename from private/lib/task/GenerateUserActivationMailTask.php
rename to app/private/lib/task/GenerateUserActivationMailTask.php
diff --git a/private/lib/task/GenerateUserPasswordRecoveryMailTask.php b/app/private/lib/task/GenerateUserPasswordRecoveryMailTask.php
similarity index 100%
rename from private/lib/task/GenerateUserPasswordRecoveryMailTask.php
rename to app/private/lib/task/GenerateUserPasswordRecoveryMailTask.php
diff --git a/private/lib/task/MailSendTask.php b/app/private/lib/task/MailSendTask.php
similarity index 100%
rename from private/lib/task/MailSendTask.php
rename to app/private/lib/task/MailSendTask.php
diff --git a/private/lib/task/NewsletterCheckTask.php b/app/private/lib/task/NewsletterCheckTask.php
similarity index 100%
rename from private/lib/task/NewsletterCheckTask.php
rename to app/private/lib/task/NewsletterCheckTask.php
diff --git a/private/lib/task/SendBackupTask.php b/app/private/lib/task/SendBackupTask.php
similarity index 100%
rename from private/lib/task/SendBackupTask.php
rename to app/private/lib/task/SendBackupTask.php
diff --git a/private/lib/task/Task.php b/app/private/lib/task/Task.php
similarity index 100%
rename from private/lib/task/Task.php
rename to app/private/lib/task/Task.php
diff --git a/private/lib/task/TestTask.php b/app/private/lib/task/TestTask.php
similarity index 100%
rename from private/lib/task/TestTask.php
rename to app/private/lib/task/TestTask.php
diff --git a/private/lib/task/UpdateMeteoCacheTask.php b/app/private/lib/task/UpdateMeteoCacheTask.php
similarity index 100%
rename from private/lib/task/UpdateMeteoCacheTask.php
rename to app/private/lib/task/UpdateMeteoCacheTask.php
diff --git a/private/lib/task/lib.inclusion.php b/app/private/lib/task/lib.inclusion.php
similarity index 100%
rename from private/lib/task/lib.inclusion.php
rename to app/private/lib/task/lib.inclusion.php
diff --git a/private/load.php b/app/private/load.php
similarity index 100%
rename from private/load.php
rename to app/private/load.php
diff --git a/public/admin/addMultimedia.php b/app/public/admin/addMultimedia.php
similarity index 100%
rename from public/admin/addMultimedia.php
rename to app/public/admin/addMultimedia.php
diff --git a/public/admin/confirmAdmin.php b/app/public/admin/confirmAdmin.php
similarity index 100%
rename from public/admin/confirmAdmin.php
rename to app/public/admin/confirmAdmin.php
diff --git a/public/admin/confirmNewsletter.php b/app/public/admin/confirmNewsletter.php
similarity index 100%
rename from public/admin/confirmNewsletter.php
rename to app/public/admin/confirmNewsletter.php
diff --git a/public/admin/deleteAmministratori.php b/app/public/admin/deleteAmministratori.php
similarity index 100%
rename from public/admin/deleteAmministratori.php
rename to app/public/admin/deleteAmministratori.php
diff --git a/public/admin/deleteBanner.php b/app/public/admin/deleteBanner.php
similarity index 100%
rename from public/admin/deleteBanner.php
rename to app/public/admin/deleteBanner.php
diff --git a/public/admin/deleteGiornalisti.php b/app/public/admin/deleteGiornalisti.php
similarity index 100%
rename from public/admin/deleteGiornalisti.php
rename to app/public/admin/deleteGiornalisti.php
diff --git a/public/admin/deleteMail.php b/app/public/admin/deleteMail.php
similarity index 100%
rename from public/admin/deleteMail.php
rename to app/public/admin/deleteMail.php
diff --git a/public/admin/deleteNewsletter.php b/app/public/admin/deleteNewsletter.php
similarity index 100%
rename from public/admin/deleteNewsletter.php
rename to app/public/admin/deleteNewsletter.php
diff --git a/public/admin/deleteNotizie.php b/app/public/admin/deleteNotizie.php
similarity index 100%
rename from public/admin/deleteNotizie.php
rename to app/public/admin/deleteNotizie.php
diff --git a/public/admin/deleteUtenti.php b/app/public/admin/deleteUtenti.php
similarity index 100%
rename from public/admin/deleteUtenti.php
rename to app/public/admin/deleteUtenti.php
diff --git a/public/admin/editAmministratori.php b/app/public/admin/editAmministratori.php
similarity index 100%
rename from public/admin/editAmministratori.php
rename to app/public/admin/editAmministratori.php
diff --git a/public/admin/editBanner.php b/app/public/admin/editBanner.php
similarity index 100%
rename from public/admin/editBanner.php
rename to app/public/admin/editBanner.php
diff --git a/public/admin/editBannerImage.php b/app/public/admin/editBannerImage.php
similarity index 100%
rename from public/admin/editBannerImage.php
rename to app/public/admin/editBannerImage.php
diff --git a/public/admin/editCommento.php b/app/public/admin/editCommento.php
similarity index 100%
rename from public/admin/editCommento.php
rename to app/public/admin/editCommento.php
diff --git a/public/admin/editConfig.php b/app/public/admin/editConfig.php
similarity index 100%
rename from public/admin/editConfig.php
rename to app/public/admin/editConfig.php
diff --git a/public/admin/editGiornalisti.php b/app/public/admin/editGiornalisti.php
similarity index 100%
rename from public/admin/editGiornalisti.php
rename to app/public/admin/editGiornalisti.php
diff --git a/public/admin/editMail.php b/app/public/admin/editMail.php
similarity index 100%
rename from public/admin/editMail.php
rename to app/public/admin/editMail.php
diff --git a/public/admin/editNewsletter.php b/app/public/admin/editNewsletter.php
similarity index 100%
rename from public/admin/editNewsletter.php
rename to app/public/admin/editNewsletter.php
diff --git a/public/admin/editNotizie.php b/app/public/admin/editNotizie.php
similarity index 100%
rename from public/admin/editNotizie.php
rename to app/public/admin/editNotizie.php
diff --git a/public/admin/editSondaggi.php b/app/public/admin/editSondaggi.php
similarity index 100%
rename from public/admin/editSondaggi.php
rename to app/public/admin/editSondaggi.php
diff --git a/public/admin/homeBanner.php b/app/public/admin/homeBanner.php
similarity index 100%
rename from public/admin/homeBanner.php
rename to app/public/admin/homeBanner.php
diff --git a/public/admin/homeMultimedia.php b/app/public/admin/homeMultimedia.php
similarity index 100%
rename from public/admin/homeMultimedia.php
rename to app/public/admin/homeMultimedia.php
diff --git a/public/admin/homeNotizie.php b/app/public/admin/homeNotizie.php
similarity index 100%
rename from public/admin/homeNotizie.php
rename to app/public/admin/homeNotizie.php
diff --git a/public/admin/index.php b/app/public/admin/index.php
similarity index 100%
rename from public/admin/index.php
rename to app/public/admin/index.php
diff --git a/public/admin/listAccess.php b/app/public/admin/listAccess.php
similarity index 100%
rename from public/admin/listAccess.php
rename to app/public/admin/listAccess.php
diff --git a/public/admin/listAmministratori.php b/app/public/admin/listAmministratori.php
similarity index 100%
rename from public/admin/listAmministratori.php
rename to app/public/admin/listAmministratori.php
diff --git a/public/admin/listBanner.php b/app/public/admin/listBanner.php
similarity index 100%
rename from public/admin/listBanner.php
rename to app/public/admin/listBanner.php
diff --git a/public/admin/listGiornalisti.php b/app/public/admin/listGiornalisti.php
similarity index 100%
rename from public/admin/listGiornalisti.php
rename to app/public/admin/listGiornalisti.php
diff --git a/public/admin/listMail.php b/app/public/admin/listMail.php
similarity index 100%
rename from public/admin/listMail.php
rename to app/public/admin/listMail.php
diff --git a/public/admin/listNotizie.php b/app/public/admin/listNotizie.php
similarity index 100%
rename from public/admin/listNotizie.php
rename to app/public/admin/listNotizie.php
diff --git a/public/admin/listUsers.php b/app/public/admin/listUsers.php
similarity index 100%
rename from public/admin/listUsers.php
rename to app/public/admin/listUsers.php
diff --git a/public/admin/logMessageDetails.php b/app/public/admin/logMessageDetails.php
similarity index 100%
rename from public/admin/logMessageDetails.php
rename to app/public/admin/logMessageDetails.php
diff --git a/public/admin/login.php b/app/public/admin/login.php
similarity index 100%
rename from public/admin/login.php
rename to app/public/admin/login.php
diff --git a/public/admin/logout.php b/app/public/admin/logout.php
similarity index 100%
rename from public/admin/logout.php
rename to app/public/admin/logout.php
diff --git a/public/admin/logs.php b/app/public/admin/logs.php
similarity index 100%
rename from public/admin/logs.php
rename to app/public/admin/logs.php
diff --git a/public/admin/myNotizie.php b/app/public/admin/myNotizie.php
similarity index 100%
rename from public/admin/myNotizie.php
rename to app/public/admin/myNotizie.php
diff --git a/public/admin/newBanner.php b/app/public/admin/newBanner.php
similarity index 100%
rename from public/admin/newBanner.php
rename to app/public/admin/newBanner.php
diff --git a/public/admin/notiziaCommentiList.php b/app/public/admin/notiziaCommentiList.php
similarity index 100%
rename from public/admin/notiziaCommentiList.php
rename to app/public/admin/notiziaCommentiList.php
diff --git a/public/admin/passwordRecovery.php b/app/public/admin/passwordRecovery.php
similarity index 100%
rename from public/admin/passwordRecovery.php
rename to app/public/admin/passwordRecovery.php
diff --git a/public/admin/pendingNewsletters.php b/app/public/admin/pendingNewsletters.php
similarity index 100%
rename from public/admin/pendingNewsletters.php
rename to app/public/admin/pendingNewsletters.php
diff --git a/public/admin/rejectedNotizie.php b/app/public/admin/rejectedNotizie.php
similarity index 100%
rename from public/admin/rejectedNotizie.php
rename to app/public/admin/rejectedNotizie.php
diff --git a/public/admin/resetPassword.php b/app/public/admin/resetPassword.php
similarity index 100%
rename from public/admin/resetPassword.php
rename to app/public/admin/resetPassword.php
diff --git a/public/admin/sentNewsletters.php b/app/public/admin/sentNewsletters.php
similarity index 100%
rename from public/admin/sentNewsletters.php
rename to app/public/admin/sentNewsletters.php
diff --git a/public/admin/statCustom.php b/app/public/admin/statCustom.php
similarity index 100%
rename from public/admin/statCustom.php
rename to app/public/admin/statCustom.php
diff --git a/public/admin/statSito.php b/app/public/admin/statSito.php
similarity index 100%
rename from public/admin/statSito.php
rename to app/public/admin/statSito.php
diff --git a/public/admin/tablesBackends/accessListTableBackend.php b/app/public/admin/tablesBackends/accessListTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/accessListTableBackend.php
rename to app/public/admin/tablesBackends/accessListTableBackend.php
diff --git a/public/admin/tablesBackends/amministratoriTableBackend.php b/app/public/admin/tablesBackends/amministratoriTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/amministratoriTableBackend.php
rename to app/public/admin/tablesBackends/amministratoriTableBackend.php
diff --git a/public/admin/tablesBackends/bannerTableBackend.php b/app/public/admin/tablesBackends/bannerTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/bannerTableBackend.php
rename to app/public/admin/tablesBackends/bannerTableBackend.php
diff --git a/public/admin/tablesBackends/giornalistiTableBackend.php b/app/public/admin/tablesBackends/giornalistiTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/giornalistiTableBackend.php
rename to app/public/admin/tablesBackends/giornalistiTableBackend.php
diff --git a/public/admin/tablesBackends/logsTableBackend.php b/app/public/admin/tablesBackends/logsTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/logsTableBackend.php
rename to app/public/admin/tablesBackends/logsTableBackend.php
diff --git a/public/admin/tablesBackends/mailTableBackend.php b/app/public/admin/tablesBackends/mailTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/mailTableBackend.php
rename to app/public/admin/tablesBackends/mailTableBackend.php
diff --git a/public/admin/tablesBackends/myNotizieTableBackend.php b/app/public/admin/tablesBackends/myNotizieTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/myNotizieTableBackend.php
rename to app/public/admin/tablesBackends/myNotizieTableBackend.php
diff --git a/public/admin/tablesBackends/notizieTableBackend.php b/app/public/admin/tablesBackends/notizieTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/notizieTableBackend.php
rename to app/public/admin/tablesBackends/notizieTableBackend.php
diff --git a/public/admin/tablesBackends/pendingNewslettersTableBackend.php b/app/public/admin/tablesBackends/pendingNewslettersTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/pendingNewslettersTableBackend.php
rename to app/public/admin/tablesBackends/pendingNewslettersTableBackend.php
diff --git a/public/admin/tablesBackends/rejectedNotizieTableBackend.php b/app/public/admin/tablesBackends/rejectedNotizieTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/rejectedNotizieTableBackend.php
rename to app/public/admin/tablesBackends/rejectedNotizieTableBackend.php
diff --git a/public/admin/tablesBackends/sentNewslettersTableBackend.php b/app/public/admin/tablesBackends/sentNewslettersTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/sentNewslettersTableBackend.php
rename to app/public/admin/tablesBackends/sentNewslettersTableBackend.php
diff --git a/public/admin/tablesBackends/unacceptedCommentiTableBackend.php b/app/public/admin/tablesBackends/unacceptedCommentiTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/unacceptedCommentiTableBackend.php
rename to app/public/admin/tablesBackends/unacceptedCommentiTableBackend.php
diff --git a/public/admin/tablesBackends/unacceptedNotizieTableBackend.php b/app/public/admin/tablesBackends/unacceptedNotizieTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/unacceptedNotizieTableBackend.php
rename to app/public/admin/tablesBackends/unacceptedNotizieTableBackend.php
diff --git a/public/admin/tablesBackends/utentiTableBackend.php b/app/public/admin/tablesBackends/utentiTableBackend.php
similarity index 100%
rename from public/admin/tablesBackends/utentiTableBackend.php
rename to app/public/admin/tablesBackends/utentiTableBackend.php
diff --git a/public/admin/unacceptedCommenti.php b/app/public/admin/unacceptedCommenti.php
similarity index 100%
rename from public/admin/unacceptedCommenti.php
rename to app/public/admin/unacceptedCommenti.php
diff --git a/public/admin/unacceptedNotizie.php b/app/public/admin/unacceptedNotizie.php
similarity index 100%
rename from public/admin/unacceptedNotizie.php
rename to app/public/admin/unacceptedNotizie.php
diff --git a/public/admin/validateCommento.php b/app/public/admin/validateCommento.php
similarity index 100%
rename from public/admin/validateCommento.php
rename to app/public/admin/validateCommento.php
diff --git a/public/archivio.php b/app/public/archivio.php
similarity index 100%
rename from public/archivio.php
rename to app/public/archivio.php
diff --git a/public/articolo.php b/app/public/articolo.php
similarity index 100%
rename from public/articolo.php
rename to app/public/articolo.php
diff --git a/public/categorySummary.php b/app/public/categorySummary.php
similarity index 100%
rename from public/categorySummary.php
rename to app/public/categorySummary.php
diff --git a/public/confirmUser.php b/app/public/confirmUser.php
similarity index 100%
rename from public/confirmUser.php
rename to app/public/confirmUser.php
diff --git a/public/getBanner.php b/app/public/getBanner.php
similarity index 100%
rename from public/getBanner.php
rename to app/public/getBanner.php
diff --git a/public/getImage.php b/app/public/getImage.php
similarity index 100%
rename from public/getImage.php
rename to app/public/getImage.php
diff --git a/public/getLocalVideo.php b/app/public/getLocalVideo.php
similarity index 100%
rename from public/getLocalVideo.php
rename to app/public/getLocalVideo.php
diff --git a/public/getPDF.php b/app/public/getPDF.php
similarity index 100%
rename from public/getPDF.php
rename to app/public/getPDF.php
diff --git a/public/googled87f8ee5060d0df7.html b/app/public/googled87f8ee5060d0df7.html
similarity index 100%
rename from public/googled87f8ee5060d0df7.html
rename to app/public/googled87f8ee5060d0df7.html
diff --git a/public/images/UnderConstruction.png b/app/public/images/UnderConstruction.png
similarity index 100%
rename from public/images/UnderConstruction.png
rename to app/public/images/UnderConstruction.png
diff --git a/public/images/admin/header.png b/app/public/images/admin/header.png
similarity index 100%
rename from public/images/admin/header.png
rename to app/public/images/admin/header.png
diff --git a/public/images/ads.png b/app/public/images/ads.png
similarity index 100%
rename from public/images/ads.png
rename to app/public/images/ads.png
diff --git a/public/images/ads_big.png b/app/public/images/ads_big.png
similarity index 100%
rename from public/images/ads_big.png
rename to app/public/images/ads_big.png
diff --git a/public/images/bannerMiddle.png b/app/public/images/bannerMiddle.png
similarity index 100%
rename from public/images/bannerMiddle.png
rename to app/public/images/bannerMiddle.png
diff --git a/public/images/blueBall.png b/app/public/images/blueBall.png
similarity index 100%
rename from public/images/blueBall.png
rename to app/public/images/blueBall.png
diff --git a/public/images/blueBalls.png b/app/public/images/blueBalls.png
similarity index 100%
rename from public/images/blueBalls.png
rename to app/public/images/blueBalls.png
diff --git a/public/images/categoryIcon.png b/app/public/images/categoryIcon.png
similarity index 100%
rename from public/images/categoryIcon.png
rename to app/public/images/categoryIcon.png
diff --git a/public/images/dataTables/sort_asc.png b/app/public/images/dataTables/sort_asc.png
similarity index 100%
rename from public/images/dataTables/sort_asc.png
rename to app/public/images/dataTables/sort_asc.png
diff --git a/public/images/dataTables/sort_asc_disabled.png b/app/public/images/dataTables/sort_asc_disabled.png
similarity index 100%
rename from public/images/dataTables/sort_asc_disabled.png
rename to app/public/images/dataTables/sort_asc_disabled.png
diff --git a/public/images/dataTables/sort_both.png b/app/public/images/dataTables/sort_both.png
similarity index 100%
rename from public/images/dataTables/sort_both.png
rename to app/public/images/dataTables/sort_both.png
diff --git a/public/images/dataTables/sort_desc.png b/app/public/images/dataTables/sort_desc.png
similarity index 100%
rename from public/images/dataTables/sort_desc.png
rename to app/public/images/dataTables/sort_desc.png
diff --git a/public/images/dataTables/sort_desc_disabled.png b/app/public/images/dataTables/sort_desc_disabled.png
similarity index 100%
rename from public/images/dataTables/sort_desc_disabled.png
rename to app/public/images/dataTables/sort_desc_disabled.png
diff --git a/public/images/default-skin.png b/app/public/images/default-skin.png
similarity index 100%
rename from public/images/default-skin.png
rename to app/public/images/default-skin.png
diff --git a/public/images/default-skin.svg b/app/public/images/default-skin.svg
similarity index 100%
rename from public/images/default-skin.svg
rename to app/public/images/default-skin.svg
diff --git a/public/images/favicon.ico b/app/public/images/favicon.ico
similarity index 100%
rename from public/images/favicon.ico
rename to app/public/images/favicon.ico
diff --git a/public/images/fb.png b/app/public/images/fb.png
similarity index 100%
rename from public/images/fb.png
rename to app/public/images/fb.png
diff --git a/public/images/fb_round.png b/app/public/images/fb_round.png
similarity index 100%
rename from public/images/fb_round.png
rename to app/public/images/fb_round.png
diff --git a/public/images/google.png b/app/public/images/google.png
similarity index 100%
rename from public/images/google.png
rename to app/public/images/google.png
diff --git a/public/images/google_round.png b/app/public/images/google_round.png
similarity index 100%
rename from public/images/google_round.png
rename to app/public/images/google_round.png
diff --git a/public/images/icon.png b/app/public/images/icon.png
similarity index 100%
rename from public/images/icon.png
rename to app/public/images/icon.png
diff --git a/public/images/jqueryui/ui-bg_diagonals-thick_18_b81900_40x40.png b/app/public/images/jqueryui/ui-bg_diagonals-thick_18_b81900_40x40.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_diagonals-thick_18_b81900_40x40.png
rename to app/public/images/jqueryui/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/public/images/jqueryui/ui-bg_diagonals-thick_20_666666_40x40.png b/app/public/images/jqueryui/ui-bg_diagonals-thick_20_666666_40x40.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_diagonals-thick_20_666666_40x40.png
rename to app/public/images/jqueryui/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/public/images/jqueryui/ui-bg_flat_10_000000_40x100.png b/app/public/images/jqueryui/ui-bg_flat_10_000000_40x100.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_flat_10_000000_40x100.png
rename to app/public/images/jqueryui/ui-bg_flat_10_000000_40x100.png
diff --git a/public/images/jqueryui/ui-bg_glass_100_f6f6f6_1x400.png b/app/public/images/jqueryui/ui-bg_glass_100_f6f6f6_1x400.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_glass_100_f6f6f6_1x400.png
rename to app/public/images/jqueryui/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/public/images/jqueryui/ui-bg_glass_100_fdf5ce_1x400.png b/app/public/images/jqueryui/ui-bg_glass_100_fdf5ce_1x400.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_glass_100_fdf5ce_1x400.png
rename to app/public/images/jqueryui/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/public/images/jqueryui/ui-bg_glass_65_ffffff_1x400.png b/app/public/images/jqueryui/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_glass_65_ffffff_1x400.png
rename to app/public/images/jqueryui/ui-bg_glass_65_ffffff_1x400.png
diff --git a/public/images/jqueryui/ui-bg_gloss-wave_35_f6a828_500x100.png b/app/public/images/jqueryui/ui-bg_gloss-wave_35_f6a828_500x100.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_gloss-wave_35_f6a828_500x100.png
rename to app/public/images/jqueryui/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/public/images/jqueryui/ui-bg_highlight-soft_100_eeeeee_1x100.png b/app/public/images/jqueryui/ui-bg_highlight-soft_100_eeeeee_1x100.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_highlight-soft_100_eeeeee_1x100.png
rename to app/public/images/jqueryui/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/public/images/jqueryui/ui-bg_highlight-soft_75_ffe45c_1x100.png b/app/public/images/jqueryui/ui-bg_highlight-soft_75_ffe45c_1x100.png
similarity index 100%
rename from public/images/jqueryui/ui-bg_highlight-soft_75_ffe45c_1x100.png
rename to app/public/images/jqueryui/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/public/images/jqueryui/ui-icons_222222_256x240.png b/app/public/images/jqueryui/ui-icons_222222_256x240.png
similarity index 100%
rename from public/images/jqueryui/ui-icons_222222_256x240.png
rename to app/public/images/jqueryui/ui-icons_222222_256x240.png
diff --git a/public/images/jqueryui/ui-icons_228ef1_256x240.png b/app/public/images/jqueryui/ui-icons_228ef1_256x240.png
similarity index 100%
rename from public/images/jqueryui/ui-icons_228ef1_256x240.png
rename to app/public/images/jqueryui/ui-icons_228ef1_256x240.png
diff --git a/public/images/jqueryui/ui-icons_ef8c08_256x240.png b/app/public/images/jqueryui/ui-icons_ef8c08_256x240.png
similarity index 100%
rename from public/images/jqueryui/ui-icons_ef8c08_256x240.png
rename to app/public/images/jqueryui/ui-icons_ef8c08_256x240.png
diff --git a/public/images/jqueryui/ui-icons_ffd27a_256x240.png b/app/public/images/jqueryui/ui-icons_ffd27a_256x240.png
similarity index 100%
rename from public/images/jqueryui/ui-icons_ffd27a_256x240.png
rename to app/public/images/jqueryui/ui-icons_ffd27a_256x240.png
diff --git a/public/images/jqueryui/ui-icons_ffffff_256x240.png b/app/public/images/jqueryui/ui-icons_ffffff_256x240.png
similarity index 100%
rename from public/images/jqueryui/ui-icons_ffffff_256x240.png
rename to app/public/images/jqueryui/ui-icons_ffffff_256x240.png
diff --git a/public/images/leftArrow.png b/app/public/images/leftArrow.png
similarity index 100%
rename from public/images/leftArrow.png
rename to app/public/images/leftArrow.png
diff --git a/public/images/leftImage.png b/app/public/images/leftImage.png
similarity index 100%
rename from public/images/leftImage.png
rename to app/public/images/leftImage.png
diff --git a/public/images/linkedin.png b/app/public/images/linkedin.png
similarity index 100%
rename from public/images/linkedin.png
rename to app/public/images/linkedin.png
diff --git a/public/images/linkedin_round.png b/app/public/images/linkedin_round.png
similarity index 100%
rename from public/images/linkedin_round.png
rename to app/public/images/linkedin_round.png
diff --git a/public/images/loading.gif b/app/public/images/loading.gif
similarity index 100%
rename from public/images/loading.gif
rename to app/public/images/loading.gif
diff --git a/public/images/logo_uff.png b/app/public/images/logo_uff.png
similarity index 100%
rename from public/images/logo_uff.png
rename to app/public/images/logo_uff.png
diff --git a/public/images/magnifyingGlass.png b/app/public/images/magnifyingGlass.png
similarity index 100%
rename from public/images/magnifyingGlass.png
rename to app/public/images/magnifyingGlass.png
diff --git a/public/images/mail_small.png b/app/public/images/mail_small.png
similarity index 100%
rename from public/images/mail_small.png
rename to app/public/images/mail_small.png
diff --git a/public/images/menuArrow.png b/app/public/images/menuArrow.png
similarity index 100%
rename from public/images/menuArrow.png
rename to app/public/images/menuArrow.png
diff --git a/public/images/menuBackground.png b/app/public/images/menuBackground.png
similarity index 100%
rename from public/images/menuBackground.png
rename to app/public/images/menuBackground.png
diff --git a/public/images/meteo.png b/app/public/images/meteo.png
similarity index 100%
rename from public/images/meteo.png
rename to app/public/images/meteo.png
diff --git a/public/images/pdf.png b/app/public/images/pdf.png
similarity index 100%
rename from public/images/pdf.png
rename to app/public/images/pdf.png
diff --git a/public/images/preloader.gif b/app/public/images/preloader.gif
similarity index 100%
rename from public/images/preloader.gif
rename to app/public/images/preloader.gif
diff --git a/public/images/print_small.png b/app/public/images/print_small.png
similarity index 100%
rename from public/images/print_small.png
rename to app/public/images/print_small.png
diff --git a/public/images/rightArrow.png b/app/public/images/rightArrow.png
similarity index 100%
rename from public/images/rightArrow.png
rename to app/public/images/rightArrow.png
diff --git a/public/images/rightImage.png b/app/public/images/rightImage.png
similarity index 100%
rename from public/images/rightImage.png
rename to app/public/images/rightImage.png
diff --git a/public/images/sprite/sprite_big_blue.png b/app/public/images/sprite/sprite_big_blue.png
similarity index 100%
rename from public/images/sprite/sprite_big_blue.png
rename to app/public/images/sprite/sprite_big_blue.png
diff --git a/public/images/sprite/sprite_big_grey.png b/app/public/images/sprite/sprite_big_grey.png
similarity index 100%
rename from public/images/sprite/sprite_big_grey.png
rename to app/public/images/sprite/sprite_big_grey.png
diff --git a/public/images/sprite/sprite_big_white.png b/app/public/images/sprite/sprite_big_white.png
similarity index 100%
rename from public/images/sprite/sprite_big_white.png
rename to app/public/images/sprite/sprite_big_white.png
diff --git a/public/images/sprite/sprite_medium_blue.png b/app/public/images/sprite/sprite_medium_blue.png
similarity index 100%
rename from public/images/sprite/sprite_medium_blue.png
rename to app/public/images/sprite/sprite_medium_blue.png
diff --git a/public/images/sprite/sprite_medium_grey.png b/app/public/images/sprite/sprite_medium_grey.png
similarity index 100%
rename from public/images/sprite/sprite_medium_grey.png
rename to app/public/images/sprite/sprite_medium_grey.png
diff --git a/public/images/sprite/sprite_medium_white.png b/app/public/images/sprite/sprite_medium_white.png
similarity index 100%
rename from public/images/sprite/sprite_medium_white.png
rename to app/public/images/sprite/sprite_medium_white.png
diff --git a/public/images/sprite/sprite_small_blue.png b/app/public/images/sprite/sprite_small_blue.png
similarity index 100%
rename from public/images/sprite/sprite_small_blue.png
rename to app/public/images/sprite/sprite_small_blue.png
diff --git a/public/images/sprite/sprite_small_grey.png b/app/public/images/sprite/sprite_small_grey.png
similarity index 100%
rename from public/images/sprite/sprite_small_grey.png
rename to app/public/images/sprite/sprite_small_grey.png
diff --git a/public/images/sprite/sprite_small_white.png b/app/public/images/sprite/sprite_small_white.png
similarity index 100%
rename from public/images/sprite/sprite_small_white.png
rename to app/public/images/sprite/sprite_small_white.png
diff --git a/public/images/stampa.png b/app/public/images/stampa.png
similarity index 100%
rename from public/images/stampa.png
rename to app/public/images/stampa.png
diff --git a/public/images/title_small.png b/app/public/images/title_small.png
similarity index 100%
rename from public/images/title_small.png
rename to app/public/images/title_small.png
diff --git a/public/images/twitter.png b/app/public/images/twitter.png
similarity index 100%
rename from public/images/twitter.png
rename to app/public/images/twitter.png
diff --git a/public/images/twitter_round.png b/app/public/images/twitter_round.png
similarity index 100%
rename from public/images/twitter_round.png
rename to app/public/images/twitter_round.png
diff --git a/public/images/youtube-icon.png b/app/public/images/youtube-icon.png
similarity index 100%
rename from public/images/youtube-icon.png
rename to app/public/images/youtube-icon.png
diff --git a/public/images/youtube.png b/app/public/images/youtube.png
similarity index 100%
rename from public/images/youtube.png
rename to app/public/images/youtube.png
diff --git a/public/index.php b/app/public/index.php
similarity index 100%
rename from public/index.php
rename to app/public/index.php
diff --git a/public/js/calls.js b/app/public/js/calls.js
similarity index 100%
rename from public/js/calls.js
rename to app/public/js/calls.js
diff --git a/public/js/chosen.jquery.min.js b/app/public/js/chosen.jquery.min.js
similarity index 100%
rename from public/js/chosen.jquery.min.js
rename to app/public/js/chosen.jquery.min.js
diff --git a/public/js/ckeditor/CHANGES.md b/app/public/js/ckeditor/CHANGES.md
similarity index 100%
rename from public/js/ckeditor/CHANGES.md
rename to app/public/js/ckeditor/CHANGES.md
diff --git a/public/js/ckeditor/LICENSE.md b/app/public/js/ckeditor/LICENSE.md
similarity index 100%
rename from public/js/ckeditor/LICENSE.md
rename to app/public/js/ckeditor/LICENSE.md
diff --git a/public/js/ckeditor/README.md b/app/public/js/ckeditor/README.md
similarity index 100%
rename from public/js/ckeditor/README.md
rename to app/public/js/ckeditor/README.md
diff --git a/public/js/ckeditor/adapters/jquery.js b/app/public/js/ckeditor/adapters/jquery.js
similarity index 100%
rename from public/js/ckeditor/adapters/jquery.js
rename to app/public/js/ckeditor/adapters/jquery.js
diff --git a/public/js/ckeditor/build-config.js b/app/public/js/ckeditor/build-config.js
similarity index 100%
rename from public/js/ckeditor/build-config.js
rename to app/public/js/ckeditor/build-config.js
diff --git a/public/js/ckeditor/ckeditor.js b/app/public/js/ckeditor/ckeditor.js
similarity index 100%
rename from public/js/ckeditor/ckeditor.js
rename to app/public/js/ckeditor/ckeditor.js
diff --git a/public/js/ckeditor/config.js b/app/public/js/ckeditor/config.js
similarity index 100%
rename from public/js/ckeditor/config.js
rename to app/public/js/ckeditor/config.js
diff --git a/public/js/ckeditor/contents.css b/app/public/js/ckeditor/contents.css
similarity index 100%
rename from public/js/ckeditor/contents.css
rename to app/public/js/ckeditor/contents.css
diff --git a/public/js/ckeditor/lang/en.js b/app/public/js/ckeditor/lang/en.js
similarity index 100%
rename from public/js/ckeditor/lang/en.js
rename to app/public/js/ckeditor/lang/en.js
diff --git a/public/js/ckeditor/lang/it.js b/app/public/js/ckeditor/lang/it.js
similarity index 100%
rename from public/js/ckeditor/lang/it.js
rename to app/public/js/ckeditor/lang/it.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/af.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/es.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/id.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/km.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/si.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/th.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
diff --git a/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
similarity index 100%
rename from public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
rename to app/public/js/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
diff --git a/public/js/ckeditor/plugins/about/dialogs/about.js b/app/public/js/ckeditor/plugins/about/dialogs/about.js
similarity index 100%
rename from public/js/ckeditor/plugins/about/dialogs/about.js
rename to app/public/js/ckeditor/plugins/about/dialogs/about.js
diff --git a/public/js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png b/app/public/js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
similarity index 100%
rename from public/js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
rename to app/public/js/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
diff --git a/public/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/app/public/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png
similarity index 100%
rename from public/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png
rename to app/public/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png
diff --git a/public/js/ckeditor/plugins/clipboard/dialogs/paste.js b/app/public/js/ckeditor/plugins/clipboard/dialogs/paste.js
similarity index 100%
rename from public/js/ckeditor/plugins/clipboard/dialogs/paste.js
rename to app/public/js/ckeditor/plugins/clipboard/dialogs/paste.js
diff --git a/public/js/ckeditor/plugins/dialog/dialogDefinition.js b/app/public/js/ckeditor/plugins/dialog/dialogDefinition.js
similarity index 100%
rename from public/js/ckeditor/plugins/dialog/dialogDefinition.js
rename to app/public/js/ckeditor/plugins/dialog/dialogDefinition.js
diff --git a/public/js/ckeditor/plugins/icons.png b/app/public/js/ckeditor/plugins/icons.png
similarity index 100%
rename from public/js/ckeditor/plugins/icons.png
rename to app/public/js/ckeditor/plugins/icons.png
diff --git a/public/js/ckeditor/plugins/icons_hidpi.png b/app/public/js/ckeditor/plugins/icons_hidpi.png
similarity index 100%
rename from public/js/ckeditor/plugins/icons_hidpi.png
rename to app/public/js/ckeditor/plugins/icons_hidpi.png
diff --git a/public/js/ckeditor/plugins/image/dialogs/image.js b/app/public/js/ckeditor/plugins/image/dialogs/image.js
similarity index 100%
rename from public/js/ckeditor/plugins/image/dialogs/image.js
rename to app/public/js/ckeditor/plugins/image/dialogs/image.js
diff --git a/public/js/ckeditor/plugins/image/images/noimage.png b/app/public/js/ckeditor/plugins/image/images/noimage.png
similarity index 100%
rename from public/js/ckeditor/plugins/image/images/noimage.png
rename to app/public/js/ckeditor/plugins/image/images/noimage.png
diff --git a/public/js/ckeditor/plugins/link/dialogs/anchor.js b/app/public/js/ckeditor/plugins/link/dialogs/anchor.js
similarity index 100%
rename from public/js/ckeditor/plugins/link/dialogs/anchor.js
rename to app/public/js/ckeditor/plugins/link/dialogs/anchor.js
diff --git a/public/js/ckeditor/plugins/link/dialogs/link.js b/app/public/js/ckeditor/plugins/link/dialogs/link.js
similarity index 100%
rename from public/js/ckeditor/plugins/link/dialogs/link.js
rename to app/public/js/ckeditor/plugins/link/dialogs/link.js
diff --git a/public/js/ckeditor/plugins/link/images/anchor.png b/app/public/js/ckeditor/plugins/link/images/anchor.png
similarity index 100%
rename from public/js/ckeditor/plugins/link/images/anchor.png
rename to app/public/js/ckeditor/plugins/link/images/anchor.png
diff --git a/public/js/ckeditor/plugins/link/images/hidpi/anchor.png b/app/public/js/ckeditor/plugins/link/images/hidpi/anchor.png
similarity index 100%
rename from public/js/ckeditor/plugins/link/images/hidpi/anchor.png
rename to app/public/js/ckeditor/plugins/link/images/hidpi/anchor.png
diff --git a/public/js/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png b/app/public/js/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
similarity index 100%
rename from public/js/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
rename to app/public/js/ckeditor/plugins/magicline/images/hidpi/icon-rtl.png
diff --git a/public/js/ckeditor/plugins/magicline/images/hidpi/icon.png b/app/public/js/ckeditor/plugins/magicline/images/hidpi/icon.png
similarity index 100%
rename from public/js/ckeditor/plugins/magicline/images/hidpi/icon.png
rename to app/public/js/ckeditor/plugins/magicline/images/hidpi/icon.png
diff --git a/public/js/ckeditor/plugins/magicline/images/icon-rtl.png b/app/public/js/ckeditor/plugins/magicline/images/icon-rtl.png
similarity index 100%
rename from public/js/ckeditor/plugins/magicline/images/icon-rtl.png
rename to app/public/js/ckeditor/plugins/magicline/images/icon-rtl.png
diff --git a/public/js/ckeditor/plugins/magicline/images/icon.png b/app/public/js/ckeditor/plugins/magicline/images/icon.png
similarity index 100%
rename from public/js/ckeditor/plugins/magicline/images/icon.png
rename to app/public/js/ckeditor/plugins/magicline/images/icon.png
diff --git a/public/js/ckeditor/plugins/pastefromword/filter/default.js b/app/public/js/ckeditor/plugins/pastefromword/filter/default.js
similarity index 100%
rename from public/js/ckeditor/plugins/pastefromword/filter/default.js
rename to app/public/js/ckeditor/plugins/pastefromword/filter/default.js
diff --git a/public/js/ckeditor/plugins/scayt/CHANGELOG.md b/app/public/js/ckeditor/plugins/scayt/CHANGELOG.md
similarity index 100%
rename from public/js/ckeditor/plugins/scayt/CHANGELOG.md
rename to app/public/js/ckeditor/plugins/scayt/CHANGELOG.md
diff --git a/public/js/ckeditor/plugins/scayt/LICENSE.md b/app/public/js/ckeditor/plugins/scayt/LICENSE.md
similarity index 100%
rename from public/js/ckeditor/plugins/scayt/LICENSE.md
rename to app/public/js/ckeditor/plugins/scayt/LICENSE.md
diff --git a/public/js/ckeditor/plugins/scayt/README.md b/app/public/js/ckeditor/plugins/scayt/README.md
similarity index 100%
rename from public/js/ckeditor/plugins/scayt/README.md
rename to app/public/js/ckeditor/plugins/scayt/README.md
diff --git a/public/js/ckeditor/plugins/scayt/dialogs/options.js b/app/public/js/ckeditor/plugins/scayt/dialogs/options.js
similarity index 100%
rename from public/js/ckeditor/plugins/scayt/dialogs/options.js
rename to app/public/js/ckeditor/plugins/scayt/dialogs/options.js
diff --git a/public/js/ckeditor/plugins/scayt/dialogs/toolbar.css b/app/public/js/ckeditor/plugins/scayt/dialogs/toolbar.css
similarity index 100%
rename from public/js/ckeditor/plugins/scayt/dialogs/toolbar.css
rename to app/public/js/ckeditor/plugins/scayt/dialogs/toolbar.css
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/af.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/af.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/af.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/af.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ar.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/ar.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ar.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/bg.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/bg.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/bg.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ca.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/ca.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ca.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/cs.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/cs.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/cs.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/cy.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/cy.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/cy.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/da.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/da.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/da.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/da.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/de.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/de.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/de.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/de.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/el.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/el.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/el.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/el.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/en.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/en.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/en.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/en.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/eo.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/eo.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/eo.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/es.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/es.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/es.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/es.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/et.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/et.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/et.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/et.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/eu.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/eu.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/eu.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fa.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/fa.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fa.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fi.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/fi.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fi.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fr.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/fr.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/fr.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/gl.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/gl.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/gl.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/he.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/he.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/he.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/he.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/hr.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/hr.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/hr.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/hu.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/hu.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/hu.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/id.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/id.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/id.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/id.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/it.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/it.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/it.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/it.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ja.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/ja.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ja.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/km.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/km.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/km.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/km.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ko.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/ko.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ko.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ku.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/ku.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ku.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/lt.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/lt.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/lt.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/lv.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/lv.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/lv.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/nb.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/nb.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/nb.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/nl.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/nl.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/nl.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/no.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/no.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/no.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/no.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/pl.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/pl.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/pl.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/pt.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/pt.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/pt.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ru.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/ru.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ru.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/si.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/si.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/si.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/si.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sk.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/sk.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sk.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sl.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/sl.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sl.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sq.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/sq.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sq.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sv.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/sv.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/sv.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/th.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/th.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/th.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/th.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/tr.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/tr.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/tr.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/tt.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/tt.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/tt.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ug.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/ug.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/ug.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/uk.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/uk.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/uk.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/vi.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/vi.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/vi.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/lang/zh.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/lang/zh.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/lang/zh.js
diff --git a/public/js/ckeditor/plugins/specialchar/dialogs/specialchar.js b/app/public/js/ckeditor/plugins/specialchar/dialogs/specialchar.js
similarity index 100%
rename from public/js/ckeditor/plugins/specialchar/dialogs/specialchar.js
rename to app/public/js/ckeditor/plugins/specialchar/dialogs/specialchar.js
diff --git a/public/js/ckeditor/plugins/table/dialogs/table.js b/app/public/js/ckeditor/plugins/table/dialogs/table.js
similarity index 100%
rename from public/js/ckeditor/plugins/table/dialogs/table.js
rename to app/public/js/ckeditor/plugins/table/dialogs/table.js
diff --git a/public/js/ckeditor/plugins/tabletools/dialogs/tableCell.js b/app/public/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
similarity index 100%
rename from public/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
rename to app/public/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
diff --git a/public/js/ckeditor/plugins/wsc/LICENSE.md b/app/public/js/ckeditor/plugins/wsc/LICENSE.md
similarity index 100%
rename from public/js/ckeditor/plugins/wsc/LICENSE.md
rename to app/public/js/ckeditor/plugins/wsc/LICENSE.md
diff --git a/public/js/ckeditor/plugins/wsc/README.md b/app/public/js/ckeditor/plugins/wsc/README.md
similarity index 100%
rename from public/js/ckeditor/plugins/wsc/README.md
rename to app/public/js/ckeditor/plugins/wsc/README.md
diff --git a/public/js/ckeditor/plugins/wsc/dialogs/ciframe.html b/app/public/js/ckeditor/plugins/wsc/dialogs/ciframe.html
similarity index 100%
rename from public/js/ckeditor/plugins/wsc/dialogs/ciframe.html
rename to app/public/js/ckeditor/plugins/wsc/dialogs/ciframe.html
diff --git a/public/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/app/public/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
similarity index 100%
rename from public/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
rename to app/public/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
diff --git a/public/js/ckeditor/plugins/wsc/dialogs/wsc.css b/app/public/js/ckeditor/plugins/wsc/dialogs/wsc.css
similarity index 100%
rename from public/js/ckeditor/plugins/wsc/dialogs/wsc.css
rename to app/public/js/ckeditor/plugins/wsc/dialogs/wsc.css
diff --git a/public/js/ckeditor/plugins/wsc/dialogs/wsc.js b/app/public/js/ckeditor/plugins/wsc/dialogs/wsc.js
similarity index 100%
rename from public/js/ckeditor/plugins/wsc/dialogs/wsc.js
rename to app/public/js/ckeditor/plugins/wsc/dialogs/wsc.js
diff --git a/public/js/ckeditor/plugins/wsc/dialogs/wsc_ie.js b/app/public/js/ckeditor/plugins/wsc/dialogs/wsc_ie.js
similarity index 100%
rename from public/js/ckeditor/plugins/wsc/dialogs/wsc_ie.js
rename to app/public/js/ckeditor/plugins/wsc/dialogs/wsc_ie.js
diff --git a/public/js/ckeditor/samples/css/samples.css b/app/public/js/ckeditor/samples/css/samples.css
similarity index 100%
rename from public/js/ckeditor/samples/css/samples.css
rename to app/public/js/ckeditor/samples/css/samples.css
diff --git a/public/js/ckeditor/samples/img/github-top.png b/app/public/js/ckeditor/samples/img/github-top.png
similarity index 100%
rename from public/js/ckeditor/samples/img/github-top.png
rename to app/public/js/ckeditor/samples/img/github-top.png
diff --git a/public/js/ckeditor/samples/img/header-bg.png b/app/public/js/ckeditor/samples/img/header-bg.png
similarity index 100%
rename from public/js/ckeditor/samples/img/header-bg.png
rename to app/public/js/ckeditor/samples/img/header-bg.png
diff --git a/public/js/ckeditor/samples/img/header-separator.png b/app/public/js/ckeditor/samples/img/header-separator.png
similarity index 100%
rename from public/js/ckeditor/samples/img/header-separator.png
rename to app/public/js/ckeditor/samples/img/header-separator.png
diff --git a/public/js/ckeditor/samples/img/logo.png b/app/public/js/ckeditor/samples/img/logo.png
similarity index 100%
rename from public/js/ckeditor/samples/img/logo.png
rename to app/public/js/ckeditor/samples/img/logo.png
diff --git a/public/js/ckeditor/samples/img/navigation-tip.png b/app/public/js/ckeditor/samples/img/navigation-tip.png
similarity index 100%
rename from public/js/ckeditor/samples/img/navigation-tip.png
rename to app/public/js/ckeditor/samples/img/navigation-tip.png
diff --git a/public/js/ckeditor/samples/index.html b/app/public/js/ckeditor/samples/index.html
similarity index 100%
rename from public/js/ckeditor/samples/index.html
rename to app/public/js/ckeditor/samples/index.html
diff --git a/public/js/ckeditor/samples/js/sample.js b/app/public/js/ckeditor/samples/js/sample.js
similarity index 100%
rename from public/js/ckeditor/samples/js/sample.js
rename to app/public/js/ckeditor/samples/js/sample.js
diff --git a/public/js/ckeditor/samples/js/sf.js b/app/public/js/ckeditor/samples/js/sf.js
similarity index 100%
rename from public/js/ckeditor/samples/js/sf.js
rename to app/public/js/ckeditor/samples/js/sf.js
diff --git a/public/js/ckeditor/samples/old/ajax.html b/app/public/js/ckeditor/samples/old/ajax.html
similarity index 100%
rename from public/js/ckeditor/samples/old/ajax.html
rename to app/public/js/ckeditor/samples/old/ajax.html
diff --git a/public/js/ckeditor/samples/old/api.html b/app/public/js/ckeditor/samples/old/api.html
similarity index 100%
rename from public/js/ckeditor/samples/old/api.html
rename to app/public/js/ckeditor/samples/old/api.html
diff --git a/public/js/ckeditor/samples/old/appendto.html b/app/public/js/ckeditor/samples/old/appendto.html
similarity index 100%
rename from public/js/ckeditor/samples/old/appendto.html
rename to app/public/js/ckeditor/samples/old/appendto.html
diff --git a/public/js/ckeditor/samples/old/assets/inlineall/logo.png b/app/public/js/ckeditor/samples/old/assets/inlineall/logo.png
similarity index 100%
rename from public/js/ckeditor/samples/old/assets/inlineall/logo.png
rename to app/public/js/ckeditor/samples/old/assets/inlineall/logo.png
diff --git a/public/js/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css b/app/public/js/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
similarity index 100%
rename from public/js/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
rename to app/public/js/ckeditor/samples/old/assets/outputxhtml/outputxhtml.css
diff --git a/public/js/ckeditor/samples/old/assets/posteddata.php b/app/public/js/ckeditor/samples/old/assets/posteddata.php
similarity index 100%
rename from public/js/ckeditor/samples/old/assets/posteddata.php
rename to app/public/js/ckeditor/samples/old/assets/posteddata.php
diff --git a/public/js/ckeditor/samples/old/assets/sample.jpg b/app/public/js/ckeditor/samples/old/assets/sample.jpg
similarity index 100%
rename from public/js/ckeditor/samples/old/assets/sample.jpg
rename to app/public/js/ckeditor/samples/old/assets/sample.jpg
diff --git a/public/js/ckeditor/samples/old/assets/uilanguages/languages.js b/app/public/js/ckeditor/samples/old/assets/uilanguages/languages.js
similarity index 100%
rename from public/js/ckeditor/samples/old/assets/uilanguages/languages.js
rename to app/public/js/ckeditor/samples/old/assets/uilanguages/languages.js
diff --git a/public/js/ckeditor/samples/old/datafiltering.html b/app/public/js/ckeditor/samples/old/datafiltering.html
similarity index 100%
rename from public/js/ckeditor/samples/old/datafiltering.html
rename to app/public/js/ckeditor/samples/old/datafiltering.html
diff --git a/public/js/ckeditor/samples/old/dialog/assets/my_dialog.js b/app/public/js/ckeditor/samples/old/dialog/assets/my_dialog.js
similarity index 100%
rename from public/js/ckeditor/samples/old/dialog/assets/my_dialog.js
rename to app/public/js/ckeditor/samples/old/dialog/assets/my_dialog.js
diff --git a/public/js/ckeditor/samples/old/dialog/dialog.html b/app/public/js/ckeditor/samples/old/dialog/dialog.html
similarity index 100%
rename from public/js/ckeditor/samples/old/dialog/dialog.html
rename to app/public/js/ckeditor/samples/old/dialog/dialog.html
diff --git a/public/js/ckeditor/samples/old/divreplace.html b/app/public/js/ckeditor/samples/old/divreplace.html
similarity index 100%
rename from public/js/ckeditor/samples/old/divreplace.html
rename to app/public/js/ckeditor/samples/old/divreplace.html
diff --git a/public/js/ckeditor/samples/old/enterkey/enterkey.html b/app/public/js/ckeditor/samples/old/enterkey/enterkey.html
similarity index 100%
rename from public/js/ckeditor/samples/old/enterkey/enterkey.html
rename to app/public/js/ckeditor/samples/old/enterkey/enterkey.html
diff --git a/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla b/app/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
similarity index 100%
rename from public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
rename to app/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.fla
diff --git a/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf b/app/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
similarity index 100%
rename from public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
rename to app/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/outputforflash.swf
diff --git a/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js b/app/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
similarity index 100%
rename from public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
rename to app/public/js/ckeditor/samples/old/htmlwriter/assets/outputforflash/swfobject.js
diff --git a/public/js/ckeditor/samples/old/htmlwriter/outputforflash.html b/app/public/js/ckeditor/samples/old/htmlwriter/outputforflash.html
similarity index 100%
rename from public/js/ckeditor/samples/old/htmlwriter/outputforflash.html
rename to app/public/js/ckeditor/samples/old/htmlwriter/outputforflash.html
diff --git a/public/js/ckeditor/samples/old/htmlwriter/outputhtml.html b/app/public/js/ckeditor/samples/old/htmlwriter/outputhtml.html
similarity index 100%
rename from public/js/ckeditor/samples/old/htmlwriter/outputhtml.html
rename to app/public/js/ckeditor/samples/old/htmlwriter/outputhtml.html
diff --git a/public/js/ckeditor/samples/old/index.html b/app/public/js/ckeditor/samples/old/index.html
similarity index 100%
rename from public/js/ckeditor/samples/old/index.html
rename to app/public/js/ckeditor/samples/old/index.html
diff --git a/public/js/ckeditor/samples/old/inlineall.html b/app/public/js/ckeditor/samples/old/inlineall.html
similarity index 100%
rename from public/js/ckeditor/samples/old/inlineall.html
rename to app/public/js/ckeditor/samples/old/inlineall.html
diff --git a/public/js/ckeditor/samples/old/inlinebycode.html b/app/public/js/ckeditor/samples/old/inlinebycode.html
similarity index 100%
rename from public/js/ckeditor/samples/old/inlinebycode.html
rename to app/public/js/ckeditor/samples/old/inlinebycode.html
diff --git a/public/js/ckeditor/samples/old/inlinetextarea.html b/app/public/js/ckeditor/samples/old/inlinetextarea.html
similarity index 100%
rename from public/js/ckeditor/samples/old/inlinetextarea.html
rename to app/public/js/ckeditor/samples/old/inlinetextarea.html
diff --git a/public/js/ckeditor/samples/old/jquery.html b/app/public/js/ckeditor/samples/old/jquery.html
similarity index 100%
rename from public/js/ckeditor/samples/old/jquery.html
rename to app/public/js/ckeditor/samples/old/jquery.html
diff --git a/public/js/ckeditor/samples/old/magicline/magicline.html b/app/public/js/ckeditor/samples/old/magicline/magicline.html
similarity index 100%
rename from public/js/ckeditor/samples/old/magicline/magicline.html
rename to app/public/js/ckeditor/samples/old/magicline/magicline.html
diff --git a/public/js/ckeditor/samples/old/readonly.html b/app/public/js/ckeditor/samples/old/readonly.html
similarity index 100%
rename from public/js/ckeditor/samples/old/readonly.html
rename to app/public/js/ckeditor/samples/old/readonly.html
diff --git a/public/js/ckeditor/samples/old/replacebyclass.html b/app/public/js/ckeditor/samples/old/replacebyclass.html
similarity index 100%
rename from public/js/ckeditor/samples/old/replacebyclass.html
rename to app/public/js/ckeditor/samples/old/replacebyclass.html
diff --git a/public/js/ckeditor/samples/old/replacebycode.html b/app/public/js/ckeditor/samples/old/replacebycode.html
similarity index 100%
rename from public/js/ckeditor/samples/old/replacebycode.html
rename to app/public/js/ckeditor/samples/old/replacebycode.html
diff --git a/public/js/ckeditor/samples/old/sample.css b/app/public/js/ckeditor/samples/old/sample.css
similarity index 100%
rename from public/js/ckeditor/samples/old/sample.css
rename to app/public/js/ckeditor/samples/old/sample.css
diff --git a/public/js/ckeditor/samples/old/sample.js b/app/public/js/ckeditor/samples/old/sample.js
similarity index 100%
rename from public/js/ckeditor/samples/old/sample.js
rename to app/public/js/ckeditor/samples/old/sample.js
diff --git a/public/js/ckeditor/samples/old/sample_posteddata.php b/app/public/js/ckeditor/samples/old/sample_posteddata.php
similarity index 100%
rename from public/js/ckeditor/samples/old/sample_posteddata.php
rename to app/public/js/ckeditor/samples/old/sample_posteddata.php
diff --git a/public/js/ckeditor/samples/old/tabindex.html b/app/public/js/ckeditor/samples/old/tabindex.html
similarity index 100%
rename from public/js/ckeditor/samples/old/tabindex.html
rename to app/public/js/ckeditor/samples/old/tabindex.html
diff --git a/public/js/ckeditor/samples/old/toolbar/toolbar.html b/app/public/js/ckeditor/samples/old/toolbar/toolbar.html
similarity index 100%
rename from public/js/ckeditor/samples/old/toolbar/toolbar.html
rename to app/public/js/ckeditor/samples/old/toolbar/toolbar.html
diff --git a/public/js/ckeditor/samples/old/uicolor.html b/app/public/js/ckeditor/samples/old/uicolor.html
similarity index 100%
rename from public/js/ckeditor/samples/old/uicolor.html
rename to app/public/js/ckeditor/samples/old/uicolor.html
diff --git a/public/js/ckeditor/samples/old/uilanguages.html b/app/public/js/ckeditor/samples/old/uilanguages.html
similarity index 100%
rename from public/js/ckeditor/samples/old/uilanguages.html
rename to app/public/js/ckeditor/samples/old/uilanguages.html
diff --git a/public/js/ckeditor/samples/old/wysiwygarea/fullpage.html b/app/public/js/ckeditor/samples/old/wysiwygarea/fullpage.html
similarity index 100%
rename from public/js/ckeditor/samples/old/wysiwygarea/fullpage.html
rename to app/public/js/ckeditor/samples/old/wysiwygarea/fullpage.html
diff --git a/public/js/ckeditor/samples/old/xhtmlstyle.html b/app/public/js/ckeditor/samples/old/xhtmlstyle.html
similarity index 100%
rename from public/js/ckeditor/samples/old/xhtmlstyle.html
rename to app/public/js/ckeditor/samples/old/xhtmlstyle.html
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/css/fontello.css b/app/public/js/ckeditor/samples/toolbarconfigurator/css/fontello.css
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/css/fontello.css
rename to app/public/js/ckeditor/samples/toolbarconfigurator/css/fontello.css
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt b/app/public/js/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
rename to app/public/js/ckeditor/samples/toolbarconfigurator/font/LICENSE.txt
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/font/config.json b/app/public/js/ckeditor/samples/toolbarconfigurator/font/config.json
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/font/config.json
rename to app/public/js/ckeditor/samples/toolbarconfigurator/font/config.json
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.eot b/app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.eot
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/font/fontello.eot
rename to app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.eot
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.svg b/app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.svg
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/font/fontello.svg
rename to app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.svg
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.ttf b/app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
rename to app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.ttf
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.woff b/app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.woff
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/font/fontello.woff
rename to app/public/js/ckeditor/samples/toolbarconfigurator/font/fontello.woff
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/index.html b/app/public/js/ckeditor/samples/toolbarconfigurator/index.html
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/index.html
rename to app/public/js/ckeditor/samples/toolbarconfigurator/index.html
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js b/app/public/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
rename to app/public/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js b/app/public/js/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
rename to app/public/js/ckeditor/samples/toolbarconfigurator/js/fulltoolbareditor.js
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js b/app/public/js/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
rename to app/public/js/ckeditor/samples/toolbarconfigurator/js/toolbarmodifier.js
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js b/app/public/js/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
rename to app/public/js/ckeditor/samples/toolbarconfigurator/js/toolbartextmodifier.js
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE b/app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
rename to app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/LICENSE
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css b/app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
rename to app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.css
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js b/app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
rename to app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/codemirror.js
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js b/app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
rename to app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/javascript.js
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css b/app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
rename to app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/neo.css
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css b/app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
rename to app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.css
diff --git a/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js b/app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
similarity index 100%
rename from public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
rename to app/public/js/ckeditor/samples/toolbarconfigurator/lib/codemirror/show-hint.js
diff --git a/public/js/ckeditor/skins/moono/dialog.css b/app/public/js/ckeditor/skins/moono/dialog.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/dialog.css
rename to app/public/js/ckeditor/skins/moono/dialog.css
diff --git a/public/js/ckeditor/skins/moono/dialog_ie.css b/app/public/js/ckeditor/skins/moono/dialog_ie.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/dialog_ie.css
rename to app/public/js/ckeditor/skins/moono/dialog_ie.css
diff --git a/public/js/ckeditor/skins/moono/dialog_ie7.css b/app/public/js/ckeditor/skins/moono/dialog_ie7.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/dialog_ie7.css
rename to app/public/js/ckeditor/skins/moono/dialog_ie7.css
diff --git a/public/js/ckeditor/skins/moono/dialog_ie8.css b/app/public/js/ckeditor/skins/moono/dialog_ie8.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/dialog_ie8.css
rename to app/public/js/ckeditor/skins/moono/dialog_ie8.css
diff --git a/public/js/ckeditor/skins/moono/dialog_iequirks.css b/app/public/js/ckeditor/skins/moono/dialog_iequirks.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/dialog_iequirks.css
rename to app/public/js/ckeditor/skins/moono/dialog_iequirks.css
diff --git a/public/js/ckeditor/skins/moono/editor.css b/app/public/js/ckeditor/skins/moono/editor.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/editor.css
rename to app/public/js/ckeditor/skins/moono/editor.css
diff --git a/public/js/ckeditor/skins/moono/editor_gecko.css b/app/public/js/ckeditor/skins/moono/editor_gecko.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/editor_gecko.css
rename to app/public/js/ckeditor/skins/moono/editor_gecko.css
diff --git a/public/js/ckeditor/skins/moono/editor_ie.css b/app/public/js/ckeditor/skins/moono/editor_ie.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/editor_ie.css
rename to app/public/js/ckeditor/skins/moono/editor_ie.css
diff --git a/public/js/ckeditor/skins/moono/editor_ie7.css b/app/public/js/ckeditor/skins/moono/editor_ie7.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/editor_ie7.css
rename to app/public/js/ckeditor/skins/moono/editor_ie7.css
diff --git a/public/js/ckeditor/skins/moono/editor_ie8.css b/app/public/js/ckeditor/skins/moono/editor_ie8.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/editor_ie8.css
rename to app/public/js/ckeditor/skins/moono/editor_ie8.css
diff --git a/public/js/ckeditor/skins/moono/editor_iequirks.css b/app/public/js/ckeditor/skins/moono/editor_iequirks.css
similarity index 100%
rename from public/js/ckeditor/skins/moono/editor_iequirks.css
rename to app/public/js/ckeditor/skins/moono/editor_iequirks.css
diff --git a/public/js/ckeditor/skins/moono/icons.png b/app/public/js/ckeditor/skins/moono/icons.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/icons.png
rename to app/public/js/ckeditor/skins/moono/icons.png
diff --git a/public/js/ckeditor/skins/moono/icons_hidpi.png b/app/public/js/ckeditor/skins/moono/icons_hidpi.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/icons_hidpi.png
rename to app/public/js/ckeditor/skins/moono/icons_hidpi.png
diff --git a/public/js/ckeditor/skins/moono/images/arrow.png b/app/public/js/ckeditor/skins/moono/images/arrow.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/arrow.png
rename to app/public/js/ckeditor/skins/moono/images/arrow.png
diff --git a/public/js/ckeditor/skins/moono/images/close.png b/app/public/js/ckeditor/skins/moono/images/close.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/close.png
rename to app/public/js/ckeditor/skins/moono/images/close.png
diff --git a/public/js/ckeditor/skins/moono/images/hidpi/close.png b/app/public/js/ckeditor/skins/moono/images/hidpi/close.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/hidpi/close.png
rename to app/public/js/ckeditor/skins/moono/images/hidpi/close.png
diff --git a/public/js/ckeditor/skins/moono/images/hidpi/lock-open.png b/app/public/js/ckeditor/skins/moono/images/hidpi/lock-open.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/hidpi/lock-open.png
rename to app/public/js/ckeditor/skins/moono/images/hidpi/lock-open.png
diff --git a/public/js/ckeditor/skins/moono/images/hidpi/lock.png b/app/public/js/ckeditor/skins/moono/images/hidpi/lock.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/hidpi/lock.png
rename to app/public/js/ckeditor/skins/moono/images/hidpi/lock.png
diff --git a/public/js/ckeditor/skins/moono/images/hidpi/refresh.png b/app/public/js/ckeditor/skins/moono/images/hidpi/refresh.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/hidpi/refresh.png
rename to app/public/js/ckeditor/skins/moono/images/hidpi/refresh.png
diff --git a/public/js/ckeditor/skins/moono/images/lock-open.png b/app/public/js/ckeditor/skins/moono/images/lock-open.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/lock-open.png
rename to app/public/js/ckeditor/skins/moono/images/lock-open.png
diff --git a/public/js/ckeditor/skins/moono/images/lock.png b/app/public/js/ckeditor/skins/moono/images/lock.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/lock.png
rename to app/public/js/ckeditor/skins/moono/images/lock.png
diff --git a/public/js/ckeditor/skins/moono/images/refresh.png b/app/public/js/ckeditor/skins/moono/images/refresh.png
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/refresh.png
rename to app/public/js/ckeditor/skins/moono/images/refresh.png
diff --git a/public/js/ckeditor/skins/moono/images/spinner.gif b/app/public/js/ckeditor/skins/moono/images/spinner.gif
similarity index 100%
rename from public/js/ckeditor/skins/moono/images/spinner.gif
rename to app/public/js/ckeditor/skins/moono/images/spinner.gif
diff --git a/public/js/ckeditor/skins/moono/readme.md b/app/public/js/ckeditor/skins/moono/readme.md
similarity index 100%
rename from public/js/ckeditor/skins/moono/readme.md
rename to app/public/js/ckeditor/skins/moono/readme.md
diff --git a/public/js/ckeditor/styles.js b/app/public/js/ckeditor/styles.js
similarity index 100%
rename from public/js/ckeditor/styles.js
rename to app/public/js/ckeditor/styles.js
diff --git a/public/js/datatables.ita.lang b/app/public/js/datatables.ita.lang
similarity index 100%
rename from public/js/datatables.ita.lang
rename to app/public/js/datatables.ita.lang
diff --git a/public/js/datatables.min.js b/app/public/js/datatables.min.js
similarity index 100%
rename from public/js/datatables.min.js
rename to app/public/js/datatables.min.js
diff --git a/public/js/datetimepicker-master/.gitignore b/app/public/js/datetimepicker-master/.gitignore
similarity index 100%
rename from public/js/datetimepicker-master/.gitignore
rename to app/public/js/datetimepicker-master/.gitignore
diff --git a/public/js/datetimepicker-master/MIT-LICENSE.txt b/app/public/js/datetimepicker-master/MIT-LICENSE.txt
similarity index 100%
rename from public/js/datetimepicker-master/MIT-LICENSE.txt
rename to app/public/js/datetimepicker-master/MIT-LICENSE.txt
diff --git a/public/js/datetimepicker-master/README.md b/app/public/js/datetimepicker-master/README.md
similarity index 100%
rename from public/js/datetimepicker-master/README.md
rename to app/public/js/datetimepicker-master/README.md
diff --git a/public/js/datetimepicker-master/bower.json b/app/public/js/datetimepicker-master/bower.json
similarity index 100%
rename from public/js/datetimepicker-master/bower.json
rename to app/public/js/datetimepicker-master/bower.json
diff --git a/public/js/datetimepicker-master/build/jquery.datetimepicker.full.js b/app/public/js/datetimepicker-master/build/jquery.datetimepicker.full.js
similarity index 100%
rename from public/js/datetimepicker-master/build/jquery.datetimepicker.full.js
rename to app/public/js/datetimepicker-master/build/jquery.datetimepicker.full.js
diff --git a/public/js/datetimepicker-master/build/jquery.datetimepicker.full.min.js b/app/public/js/datetimepicker-master/build/jquery.datetimepicker.full.min.js
similarity index 100%
rename from public/js/datetimepicker-master/build/jquery.datetimepicker.full.min.js
rename to app/public/js/datetimepicker-master/build/jquery.datetimepicker.full.min.js
diff --git a/public/js/datetimepicker-master/build/jquery.datetimepicker.min.js b/app/public/js/datetimepicker-master/build/jquery.datetimepicker.min.js
similarity index 100%
rename from public/js/datetimepicker-master/build/jquery.datetimepicker.min.js
rename to app/public/js/datetimepicker-master/build/jquery.datetimepicker.min.js
diff --git a/public/js/datetimepicker-master/datetimepicker.jquery.json b/app/public/js/datetimepicker-master/datetimepicker.jquery.json
similarity index 100%
rename from public/js/datetimepicker-master/datetimepicker.jquery.json
rename to app/public/js/datetimepicker-master/datetimepicker.jquery.json
diff --git a/public/js/datetimepicker-master/index.html b/app/public/js/datetimepicker-master/index.html
similarity index 100%
rename from public/js/datetimepicker-master/index.html
rename to app/public/js/datetimepicker-master/index.html
diff --git a/public/js/datetimepicker-master/jquery.datetimepicker.css b/app/public/js/datetimepicker-master/jquery.datetimepicker.css
similarity index 100%
rename from public/js/datetimepicker-master/jquery.datetimepicker.css
rename to app/public/js/datetimepicker-master/jquery.datetimepicker.css
diff --git a/public/js/datetimepicker-master/jquery.datetimepicker.js b/app/public/js/datetimepicker-master/jquery.datetimepicker.js
similarity index 100%
rename from public/js/datetimepicker-master/jquery.datetimepicker.js
rename to app/public/js/datetimepicker-master/jquery.datetimepicker.js
diff --git a/public/js/datetimepicker-master/jquery.datetimepicker.min.js b/app/public/js/datetimepicker-master/jquery.datetimepicker.min.js
similarity index 100%
rename from public/js/datetimepicker-master/jquery.datetimepicker.min.js
rename to app/public/js/datetimepicker-master/jquery.datetimepicker.min.js
diff --git a/public/js/datetimepicker-master/jquery.js b/app/public/js/datetimepicker-master/jquery.js
similarity index 100%
rename from public/js/datetimepicker-master/jquery.js
rename to app/public/js/datetimepicker-master/jquery.js
diff --git a/public/js/datetimepicker-master/package.json b/app/public/js/datetimepicker-master/package.json
similarity index 100%
rename from public/js/datetimepicker-master/package.json
rename to app/public/js/datetimepicker-master/package.json
diff --git a/public/js/datetimepicker-master/screen/1.png b/app/public/js/datetimepicker-master/screen/1.png
similarity index 100%
rename from public/js/datetimepicker-master/screen/1.png
rename to app/public/js/datetimepicker-master/screen/1.png
diff --git a/public/js/datetimepicker-master/screen/2.png b/app/public/js/datetimepicker-master/screen/2.png
similarity index 100%
rename from public/js/datetimepicker-master/screen/2.png
rename to app/public/js/datetimepicker-master/screen/2.png
diff --git a/public/js/datetimepicker-master/screen/3.1.png b/app/public/js/datetimepicker-master/screen/3.1.png
similarity index 100%
rename from public/js/datetimepicker-master/screen/3.1.png
rename to app/public/js/datetimepicker-master/screen/3.1.png
diff --git a/public/js/datetimepicker-master/screen/3.png b/app/public/js/datetimepicker-master/screen/3.png
similarity index 100%
rename from public/js/datetimepicker-master/screen/3.png
rename to app/public/js/datetimepicker-master/screen/3.png
diff --git a/public/js/datetimepicker-master/screen/4.png b/app/public/js/datetimepicker-master/screen/4.png
similarity index 100%
rename from public/js/datetimepicker-master/screen/4.png
rename to app/public/js/datetimepicker-master/screen/4.png
diff --git a/public/js/datetimepicker-master/screen/5.png b/app/public/js/datetimepicker-master/screen/5.png
similarity index 100%
rename from public/js/datetimepicker-master/screen/5.png
rename to app/public/js/datetimepicker-master/screen/5.png
diff --git a/public/js/datetimepicker-master/screen/6.png b/app/public/js/datetimepicker-master/screen/6.png
similarity index 100%
rename from public/js/datetimepicker-master/screen/6.png
rename to app/public/js/datetimepicker-master/screen/6.png
diff --git a/public/js/functions.js b/app/public/js/functions.js
similarity index 100%
rename from public/js/functions.js
rename to app/public/js/functions.js
diff --git a/public/js/highcharts.js b/app/public/js/highcharts.js
similarity index 100%
rename from public/js/highcharts.js
rename to app/public/js/highcharts.js
diff --git a/public/js/init.js b/app/public/js/init.js
similarity index 100%
rename from public/js/init.js
rename to app/public/js/init.js
diff --git a/public/js/jquery-1.12.0.min.js b/app/public/js/jquery-1.12.0.min.js
similarity index 100%
rename from public/js/jquery-1.12.0.min.js
rename to app/public/js/jquery-1.12.0.min.js
diff --git a/public/js/jquery-ui.min.js b/app/public/js/jquery-ui.min.js
similarity index 100%
rename from public/js/jquery-ui.min.js
rename to app/public/js/jquery-ui.min.js
diff --git a/public/js/jquery.form.js b/app/public/js/jquery.form.js
similarity index 100%
rename from public/js/jquery.form.js
rename to app/public/js/jquery.form.js
diff --git a/public/js/jquery.js b/app/public/js/jquery.js
similarity index 100%
rename from public/js/jquery.js
rename to app/public/js/jquery.js
diff --git a/public/js/photoswipe-ui-default.min.js b/app/public/js/photoswipe-ui-default.min.js
similarity index 100%
rename from public/js/photoswipe-ui-default.min.js
rename to app/public/js/photoswipe-ui-default.min.js
diff --git a/public/js/photoswipe.min.js b/app/public/js/photoswipe.min.js
similarity index 100%
rename from public/js/photoswipe.min.js
rename to app/public/js/photoswipe.min.js
diff --git a/public/load.php b/app/public/load.php
similarity index 55%
rename from public/load.php
rename to app/public/load.php
index b00c980..d0da814 100644
--- a/public/load.php
+++ b/app/public/load.php
@@ -4,6 +4,6 @@ Author: 		Riccardo Di Dato
 Creation Date:	04/mar/2015
 */
 
-require_once("/home/asdynamics/private/fdn2/load.php");
+require_once("/home/ddninja/private/fdn2/load.php");
 
 ?>
\ No newline at end of file
diff --git a/public/login.php b/app/public/login.php
similarity index 100%
rename from public/login.php
rename to app/public/login.php
diff --git a/public/logout.php b/app/public/logout.php
similarity index 100%
rename from public/logout.php
rename to app/public/logout.php
diff --git a/public/mobile/archivio.php b/app/public/mobile/archivio.php
similarity index 100%
rename from public/mobile/archivio.php
rename to app/public/mobile/archivio.php
diff --git a/public/mobile/articolo.php b/app/public/mobile/articolo.php
similarity index 100%
rename from public/mobile/articolo.php
rename to app/public/mobile/articolo.php
diff --git a/public/mobile/categorySummary.php b/app/public/mobile/categorySummary.php
similarity index 100%
rename from public/mobile/categorySummary.php
rename to app/public/mobile/categorySummary.php
diff --git a/public/mobile/getBanner.php b/app/public/mobile/getBanner.php
similarity index 100%
rename from public/mobile/getBanner.php
rename to app/public/mobile/getBanner.php
diff --git a/public/mobile/images/blueBalls.png b/app/public/mobile/images/blueBalls.png
similarity index 100%
rename from public/mobile/images/blueBalls.png
rename to app/public/mobile/images/blueBalls.png
diff --git a/public/mobile/images/closeMenuIcon.png b/app/public/mobile/images/closeMenuIcon.png
similarity index 100%
rename from public/mobile/images/closeMenuIcon.png
rename to app/public/mobile/images/closeMenuIcon.png
diff --git a/public/mobile/images/fb_round.png b/app/public/mobile/images/fb_round.png
similarity index 100%
rename from public/mobile/images/fb_round.png
rename to app/public/mobile/images/fb_round.png
diff --git a/public/mobile/images/goTopButton.png b/app/public/mobile/images/goTopButton.png
similarity index 100%
rename from public/mobile/images/goTopButton.png
rename to app/public/mobile/images/goTopButton.png
diff --git a/public/mobile/images/google_round.png b/app/public/mobile/images/google_round.png
similarity index 100%
rename from public/mobile/images/google_round.png
rename to app/public/mobile/images/google_round.png
diff --git a/public/mobile/images/linkedin_round.png b/app/public/mobile/images/linkedin_round.png
similarity index 100%
rename from public/mobile/images/linkedin_round.png
rename to app/public/mobile/images/linkedin_round.png
diff --git a/public/mobile/images/loading.gif b/app/public/mobile/images/loading.gif
similarity index 100%
rename from public/mobile/images/loading.gif
rename to app/public/mobile/images/loading.gif
diff --git a/public/mobile/images/loginIcon.png b/app/public/mobile/images/loginIcon.png
similarity index 100%
rename from public/mobile/images/loginIcon.png
rename to app/public/mobile/images/loginIcon.png
diff --git a/public/mobile/images/logo_uff.png b/app/public/mobile/images/logo_uff.png
similarity index 100%
rename from public/mobile/images/logo_uff.png
rename to app/public/mobile/images/logo_uff.png
diff --git a/public/mobile/images/magnifyingGlass.png b/app/public/mobile/images/magnifyingGlass.png
similarity index 100%
rename from public/mobile/images/magnifyingGlass.png
rename to app/public/mobile/images/magnifyingGlass.png
diff --git a/public/mobile/images/menuArrow.png b/app/public/mobile/images/menuArrow.png
similarity index 100%
rename from public/mobile/images/menuArrow.png
rename to app/public/mobile/images/menuArrow.png
diff --git a/public/mobile/images/menuBackground.png b/app/public/mobile/images/menuBackground.png
similarity index 100%
rename from public/mobile/images/menuBackground.png
rename to app/public/mobile/images/menuBackground.png
diff --git a/public/mobile/images/menuIcon.png b/app/public/mobile/images/menuIcon.png
similarity index 100%
rename from public/mobile/images/menuIcon.png
rename to app/public/mobile/images/menuIcon.png
diff --git a/public/mobile/images/menuIconTransparent.png b/app/public/mobile/images/menuIconTransparent.png
similarity index 100%
rename from public/mobile/images/menuIconTransparent.png
rename to app/public/mobile/images/menuIconTransparent.png
diff --git a/public/mobile/images/twitter_round.png b/app/public/mobile/images/twitter_round.png
similarity index 100%
rename from public/mobile/images/twitter_round.png
rename to app/public/mobile/images/twitter_round.png
diff --git a/public/mobile/index.php b/app/public/mobile/index.php
similarity index 100%
rename from public/mobile/index.php
rename to app/public/mobile/index.php
diff --git a/public/mobile/js/calls.js b/app/public/mobile/js/calls.js
similarity index 100%
rename from public/mobile/js/calls.js
rename to app/public/mobile/js/calls.js
diff --git a/public/mobile/js/functions.js b/app/public/mobile/js/functions.js
similarity index 100%
rename from public/mobile/js/functions.js
rename to app/public/mobile/js/functions.js
diff --git a/public/mobile/js/init.js b/app/public/mobile/js/init.js
similarity index 100%
rename from public/mobile/js/init.js
rename to app/public/mobile/js/init.js
diff --git a/public/mobile/js/jquery-1.12.0.min.js b/app/public/mobile/js/jquery-1.12.0.min.js
similarity index 100%
rename from public/mobile/js/jquery-1.12.0.min.js
rename to app/public/mobile/js/jquery-1.12.0.min.js
diff --git a/public/mobile/js/photoswipe-ui-default.min.js b/app/public/mobile/js/photoswipe-ui-default.min.js
similarity index 100%
rename from public/mobile/js/photoswipe-ui-default.min.js
rename to app/public/mobile/js/photoswipe-ui-default.min.js
diff --git a/public/mobile/js/photoswipe.min.js b/app/public/mobile/js/photoswipe.min.js
similarity index 100%
rename from public/mobile/js/photoswipe.min.js
rename to app/public/mobile/js/photoswipe.min.js
diff --git a/public/mobile/loginMobile.php b/app/public/mobile/loginMobile.php
similarity index 100%
rename from public/mobile/loginMobile.php
rename to app/public/mobile/loginMobile.php
diff --git a/public/mobile/logoutMobile.php b/app/public/mobile/logoutMobile.php
similarity index 100%
rename from public/mobile/logoutMobile.php
rename to app/public/mobile/logoutMobile.php
diff --git a/public/mobile/passwordForgotMobile.php b/app/public/mobile/passwordForgotMobile.php
similarity index 100%
rename from public/mobile/passwordForgotMobile.php
rename to app/public/mobile/passwordForgotMobile.php
diff --git a/public/mobile/redazione.php b/app/public/mobile/redazione.php
similarity index 100%
rename from public/mobile/redazione.php
rename to app/public/mobile/redazione.php
diff --git a/public/mobile/registrationMobile.php b/app/public/mobile/registrationMobile.php
similarity index 100%
rename from public/mobile/registrationMobile.php
rename to app/public/mobile/registrationMobile.php
diff --git a/public/mobile/searchResults.php b/app/public/mobile/searchResults.php
similarity index 100%
rename from public/mobile/searchResults.php
rename to app/public/mobile/searchResults.php
diff --git a/public/mobile/stats/bannerClick.php b/app/public/mobile/stats/bannerClick.php
similarity index 100%
rename from public/mobile/stats/bannerClick.php
rename to app/public/mobile/stats/bannerClick.php
diff --git a/public/mobile/stats/bannerImpression.php b/app/public/mobile/stats/bannerImpression.php
similarity index 100%
rename from public/mobile/stats/bannerImpression.php
rename to app/public/mobile/stats/bannerImpression.php
diff --git a/public/mobile/stats/notiziaImpression.php b/app/public/mobile/stats/notiziaImpression.php
similarity index 100%
rename from public/mobile/stats/notiziaImpression.php
rename to app/public/mobile/stats/notiziaImpression.php
diff --git a/public/mobile/stats/pageImpression.php b/app/public/mobile/stats/pageImpression.php
similarity index 100%
rename from public/mobile/stats/pageImpression.php
rename to app/public/mobile/stats/pageImpression.php
diff --git a/public/mobile/style/default-skin.css b/app/public/mobile/style/default-skin.css
similarity index 100%
rename from public/mobile/style/default-skin.css
rename to app/public/mobile/style/default-skin.css
diff --git a/public/mobile/style/normalize.css b/app/public/mobile/style/normalize.css
similarity index 100%
rename from public/mobile/style/normalize.css
rename to app/public/mobile/style/normalize.css
diff --git a/public/mobile/style/photoswipe.css b/app/public/mobile/style/photoswipe.css
similarity index 100%
rename from public/mobile/style/photoswipe.css
rename to app/public/mobile/style/photoswipe.css
diff --git a/public/mobile/style/public.css b/app/public/mobile/style/public.css
similarity index 100%
rename from public/mobile/style/public.css
rename to app/public/mobile/style/public.css
diff --git a/public/oldArticleRedirect.php b/app/public/oldArticleRedirect.php
similarity index 100%
rename from public/oldArticleRedirect.php
rename to app/public/oldArticleRedirect.php
diff --git a/public/passwordForgot.php b/app/public/passwordForgot.php
similarity index 100%
rename from public/passwordForgot.php
rename to app/public/passwordForgot.php
diff --git a/public/passwordRecovery.php b/app/public/passwordRecovery.php
similarity index 100%
rename from public/passwordRecovery.php
rename to app/public/passwordRecovery.php
diff --git a/public/printPage.php b/app/public/printPage.php
similarity index 100%
rename from public/printPage.php
rename to app/public/printPage.php
diff --git a/public/redazione.php b/app/public/redazione.php
similarity index 100%
rename from public/redazione.php
rename to app/public/redazione.php
diff --git a/public/registration.php b/app/public/registration.php
similarity index 100%
rename from public/registration.php
rename to app/public/registration.php
diff --git a/public/robots.txt b/app/public/robots.txt
similarity index 100%
rename from public/robots.txt
rename to app/public/robots.txt
diff --git a/public/rss/index.php b/app/public/rss/index.php
similarity index 100%
rename from public/rss/index.php
rename to app/public/rss/index.php
diff --git a/public/searchResults.php b/app/public/searchResults.php
similarity index 100%
rename from public/searchResults.php
rename to app/public/searchResults.php
diff --git a/public/sendCommentoBackend.php b/app/public/sendCommentoBackend.php
similarity index 100%
rename from public/sendCommentoBackend.php
rename to app/public/sendCommentoBackend.php
diff --git a/public/sendRegistrationBackend.php b/app/public/sendRegistrationBackend.php
similarity index 100%
rename from public/sendRegistrationBackend.php
rename to app/public/sendRegistrationBackend.php
diff --git a/public/sitemap.php b/app/public/sitemap.php
similarity index 100%
rename from public/sitemap.php
rename to app/public/sitemap.php
diff --git a/public/stats/bannerClick.php b/app/public/stats/bannerClick.php
similarity index 100%
rename from public/stats/bannerClick.php
rename to app/public/stats/bannerClick.php
diff --git a/public/stats/bannerImpression.php b/app/public/stats/bannerImpression.php
similarity index 100%
rename from public/stats/bannerImpression.php
rename to app/public/stats/bannerImpression.php
diff --git a/public/stats/notiziaImpression.php b/app/public/stats/notiziaImpression.php
similarity index 100%
rename from public/stats/notiziaImpression.php
rename to app/public/stats/notiziaImpression.php
diff --git a/public/stats/pageImpression.php b/app/public/stats/pageImpression.php
similarity index 100%
rename from public/stats/pageImpression.php
rename to app/public/stats/pageImpression.php
diff --git a/public/style/Bebas.woff b/app/public/style/Bebas.woff
similarity index 100%
rename from public/style/Bebas.woff
rename to app/public/style/Bebas.woff
diff --git a/public/style/BebasNeue.woff b/app/public/style/BebasNeue.woff
similarity index 100%
rename from public/style/BebasNeue.woff
rename to app/public/style/BebasNeue.woff
diff --git a/public/style/admin.css b/app/public/style/admin.css
similarity index 100%
rename from public/style/admin.css
rename to app/public/style/admin.css
diff --git a/public/style/chosen.css b/app/public/style/chosen.css
similarity index 100%
rename from public/style/chosen.css
rename to app/public/style/chosen.css
diff --git a/public/style/datatables.css b/app/public/style/datatables.css
similarity index 100%
rename from public/style/datatables.css
rename to app/public/style/datatables.css
diff --git a/public/style/default-skin.css b/app/public/style/default-skin.css
similarity index 100%
rename from public/style/default-skin.css
rename to app/public/style/default-skin.css
diff --git a/public/style/icons.css b/app/public/style/icons.css
similarity index 100%
rename from public/style/icons.css
rename to app/public/style/icons.css
diff --git a/public/style/jquery-ui.css b/app/public/style/jquery-ui.css
similarity index 100%
rename from public/style/jquery-ui.css
rename to app/public/style/jquery-ui.css
diff --git a/public/style/jquery.datetimepicker.css b/app/public/style/jquery.datetimepicker.css
similarity index 100%
rename from public/style/jquery.datetimepicker.css
rename to app/public/style/jquery.datetimepicker.css
diff --git a/public/style/normalize.css b/app/public/style/normalize.css
similarity index 100%
rename from public/style/normalize.css
rename to app/public/style/normalize.css
diff --git a/public/style/photoswipe.css b/app/public/style/photoswipe.css
similarity index 100%
rename from public/style/photoswipe.css
rename to app/public/style/photoswipe.css
diff --git a/public/style/public.css b/app/public/style/public.css
similarity index 100%
rename from public/style/public.css
rename to app/public/style/public.css
diff --git a/public/underConstruction.php b/app/public/underConstruction.php
similarity index 100%
rename from public/underConstruction.php
rename to app/public/underConstruction.php
diff --git a/build b/build
deleted file mode 100755
index f3b7414..0000000
--- a/build
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/bash
-
-###########
-# Lo script utilizza tre possibili environment: Produzione, Test e Locale
-# Permette cinque operazioni su database: Drop and rebuild all,  Drop and rebuild all content, Drop and rebuild config, Add missing tables e Skip
-###########
-
-my_dir="$(dirname "$0")"
-DIR_RETURN=`pwd`
-cd "$DIR_RETURN/$my_dir"
-
-source "buildLibs"
-
-OPTION_HELP=false 			# -h
-
-ENVIRONMENT_PRODUCTION=false 		# -p
-ENVIRONMENT_TEST=false 			# -t
-ENVIRONMENT_LOCAL=false 		# -l
-
-DATABASE_DROP_ALL=false			# -D
-DATABASE_DROP_CONTENT=false		# -C
-DATABASE_DROP_CONFIG=false		# -c
-DATABASE_FIX=false			# -f
-DATABASE_SKIP=false			# -s
-
-DEFAULT_CONFIG_FILE=".build.config"
-
-DEFAULT_DATABASE_FILE=".build_db.config"
-
-USE_CONFIG_FILE="$DEFAULT_CONFIG_FILE"
-USE_DATABASE_FILE="$DEFAULT_DATABASE_FILE"
-
-while getopts ":hptlDCcfs" optname
-do
-	case "$optname" in
-		"h")
-			OPTION_HELP=true
-		;;
-		"p")
-			ENVIRONMENT_PRODUCTION=true
-		;;
-		"t")
-			ENVIRONMENT_TEST=true
-		;;
-		"l")
-			ENVIRONMENT_LOCAL=true
-		;;
-		"D")
-			DATABASE_DROP_ALL=true
-		;;
-		"C")
-			DATABASE_DROP_CONTENT=true
-		;;
-		"c")
-			DATABASE_DROP_CONFIG=true
-		;;
-		"f")
-			DATABASE_FIX=true
-		;;
-		"s")
-			DATABASE_SKIP=true
-		;;
-		"?")
-			echo "Invalid option -$OPTARG"
-		;;
-		":")
-			echo "No argument value for option $OPTARG"
-		;;
-		*)
-		# Should not occur
-			echo "Unknown error while processing options"
-		;;
-	esac
-done
-
-if [ "$ENVIRONMENT_PRODUCTION" = false ] && [ "$ENVIRONMENT_TEST" = false ] && [ "$ENVIRONMENT_LOCAL" = false ]; then
-	OPTION_HELP=true
-fi
-
-if [ $OPTION_HELP = true ]; then
-	help
-	exit 0
-fi
-
-shift $(($OPTIND - 1))
-
-if [ "$1" != "" ]; then
-	USE_CONFIG_FILE="$1"
-fi
-
-if [ -f "$USE_CONFIG_FILE" ]; then
-	source "$USE_CONFIG_FILE"
-else
-	printf "Impossibile Leggere il file di configurazione '$USE_CONFIG_FILE')\n"
-	exit 1
-fi
-
-if [ -f "$USE_DATABASE_FILE" ]; then
-	source "$USE_DATABASE_FILE"
-else
-	printf "Impossibile Leggere il file di configurazione del database '$USE_DATABASE_FILE')\n"
-	exit 1
-fi
-
-if [ ! -w "$APACHE2_DOCUMENTROOT" ] || [ ! -w "$SYSTEM_PRIVATE" ] || [ ! -w "$SYSTEM_STORAGE" ] || [ ! -w "$SYSTEM_LOG_PATH" ]; then
-	printf "Permessi insufficienti per eseguire lo script (sudo?)\n"
-	if [ ! -w "$APACHE2_DOCUMENTROOT" ]; then
-		printf "Impossibile scrivere in '$APACHE2_DOCUMENTROOT'\n"
-	fi
-	if [ ! -w "$SYSTEM_PRIVATE" ]; then
-		printf "Impossibile scrivere in '$SYSTEM_PRIVATE'\n"
-	fi
-	if [ ! -w "$SYSTEM_STORAGE" ]; then
-		printf "Impossibile scrivere in '$SYSTEM_STORAGE'\n"
-	fi
-	if [ ! -w "$SYSTEM_LOG_PATH" ]; then
-		printf "Impossibile scrivere in '$SYSTEM_LOG_PATH'\n"
-	fi
-	exit 1
-fi
-
-
-printf "Asdynamics Application Build/Deploy Script\n"
-if [ -f .logo ]; then
-	cat .logo
-fi
-
-if [ "$ENVIRONMENT_PRODUCTION" = true ]; then
-	deploy_production_env
-elif [ "$ENVIRONMENT_TEST" = true ]; then
-	deploy_test_env
-elif [ "$ENVIRONMENT_LOCAL" = true ]; then
-	deploy_local_env
-fi
-
-if [ "$DATABASE_DROP_ALL" = true ]; then
-	database_rebuild_content
-	database_rebuild_config
-elif [ "$DATABASE_DROP_CONTENT" = true ]; then
-	database_rebuild_content
-elif [ "$DATABASE_DROP_CONFIG" = true ]; then
-	database_rebuild_config
-elif [ "$DATABASE_FIX" = true ]; then
-	database_add_missing
-elif [ "$DATABASE_SKIP" = false ]; then
-	database_add_missing
-fi
-
-cp "$USE_CONFIG_FILE" "$APPLICATION_BINARY_PATH"
-
-cd "$DIR_RETURN"
-
diff --git a/buildLibs b/buildLibs
deleted file mode 100644
index 3c6aa25..0000000
--- a/buildLibs
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/bin/bash
-
-## Funzioni utilizzate da build
-
-#Stampa i comandi possibili
-function help() {
-	printf "\n"
-	printf "build [-h] -[ptl] -[DCcfs] [config_file]\n"
-	printf "\n"
-	printf "Specificare il config_file solo se non si desidera utilizzare quello di default.\n"
-	printf "E' obbligatorio specificare l'environment. In caso di environment multipli sarà utilizzato solo quello a priorità maggiore.\n"
-	printf "L'opzione default di database è -f (fix).\n"
-	printf "\n"
-	printf "Possibili valori di option\n"
-	printf "\t -h questa schermata\n"
-	printf "\n"
-	printf "Lista environment (per deployare la configurazione) in ordine di priorità\n"
-	printf "\t -p Produzione\n"
-	printf "\t -t Test\n"
-	printf "\t -l Locale\n"
-	printf "\n"
-	printf "Opzioni database\n"
-	printf "\t -D Droppa tutto il database e lo rebuilda\n"
-	printf "\t -C Droppa le tabelle di contenuti e le rebuilda\n"
-	printf "\t -c Droppa le tabelle di configurazione e le rebuilda\n"
-	printf "\t -f Aggiunge le tabelle mancanti\n"
-	printf "\t -s Skip db fix\n"
-}
-
-#Stampa il nome del comando in esecuzione
-function printcmd () {
-	printf "*-----------------------------------------*\n"
-	printf "   PROJECT:  $PROJECT_NAME\n"
-	printf "   EXECUTING: $1\n"
-	printf "\n"
-	printf "*-----------------------------------------*\n"
-}
-
-
-
-# Imposta come proprietario della cartella l'utente apache
-function chown_folder() {
-	if [[ -z "$1" ]] || [[ "$1" == "/" ]] || [[ "$1" == "./" ]]; then
-                exit 1
-	else
-		chown -R $APACHE2_USER:$APACHE2_GROUP "$1"
-	fi
-}
-
-function svncleanup() {
-	if [[ -z "$1" ]] || [[ "$1" == "/" ]] || [[ "$1" == "./" ]]; then
-		exit 1
-	else
-		for i in `find "$1" -name .svn`; 
-		do
-			printf  "Deleting .. $i\n"
-			rm -rf "$i"
-		done
-	fi
-}
-
-# Crea le cartelle di sistema
-function create_project_fs(){
-	# CREATES APPLICATION PRIVATE FOLDER
-	mkdir -p $APPLICATION_PRIVATE
-	chown_folder $APPLICATION_PRIVATE
-	
-	# CREATES APPLICATION PUBLIC FOLDER
-	mkdir -p $APPLICATION_PUBLIC
-	chown_folder $APPLICATION_PUBLIC
-
-	# CREATES APPLICATION STORAGE FOLDER
-	mkdir -p $APPLICATION_STORAGE
-	chown_folder $APPLICATION_STORAGE
-
-	# CREATES APPLICATION LOG FOLDER
-	mkdir -p $APPLICATION_LOG_PATH
-	chown_folder $APPLICATION_LOG_PATH
-
-	# CREATES XSENDFILE FOLDER
-	mkdir -p $APPLICATION_XSENDFILE_PATH
-	chown_folder $APPLICATION_XSENDFILE_PATH
-	
-	# CREATES APPLICATION MEDIA FOLDER
-	mkdir -p $APPLICATION_MEDIA_PATH
-	chown_folder $APPLICATION_MEDIA_PATH
-	
-	# CREATES APPLICATION BACKUP FOLDER
-	mkdir -p $APPLICATION_BACKUPS_PATH
-	chown_folder $APPLICATION_BACKUPS_PATH
-	
-	# CREATES APPLICATION TEMPORARY FOLDER
-	mkdir -p $APPLICATION_TMP_PATH
-	chown_folder $APPLICATION_TMP_PATH
-}
-
-
-# Deploya i sorgenti
-function deploy(){
-	echo "Deleting old build (Private)"
-	rm -rf "$APPLICATION_PRIVATE/"*
-
-	echo "Deleting old build (Public)"
-	rm -rf "$APPLICATION_PUBLIC/"*
-	
-
-	echo "Deploying new build (Private)"
-	cp -a "./private/"* "$APPLICATION_PRIVATE"
-	svncleanup "$APPLICATION_PRIVATE"
-	chown_folder "$APPLICATION_PRIVATE"
-	
-	echo "Deploying new build (Public)"
-	cp -a "./public/"* "$APPLICATION_PUBLIC"
-	svncleanup "$APPLICATION_PUBLIC"
-	chown_folder "$APPLICATION_PUBLIC"
-	
-
-	chmod -R a+x "$APPLICATION_BINARY_PATH"
-	chmod -R a+x "$APPLICATION_CRON_PATH"
-#	chmod -R a+x "$APPLICATION_TASK_PATH"
-}
-
-
-
-# Deploya il progetto e mantiene solo la configurazione di produzione
-function deploy_production_env(){
-	create_project_fs
-	deploy
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.local.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.local.php"
-	fi
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.test.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.test.php"
-	fi
-}
-
-# Deploya il progetto e mantiene solo la configurazione del server di test
-function deploy_test_env(){
-	create_project_fs
-	deploy
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.local.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.local.php"
-	fi
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.prod.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.prod.php"
-	fi
-}
-
-# Deploya il progetto e mantiene solo la configurazione locale
-function deploy_local_env(){
-	create_project_fs
-	deploy
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.prod.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.prod.php"
-	fi
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.test.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.test.php"
-	fi
-}
-
-function database_rebuild_content(){
-	echo "Function not implemented... faking execution"
-	for collection_name in "${!MONGO_DB_CONTENT_COLLECTIONS[@]}"; do 
-		echo "Rebuilding collection $collection_name - ${MONGO_DB_CONTENT_COLLECTIONS["$collection_name"]}"; 
-	done
-
-	for table_name in "${!MYSQL_DB_CONTENT_TABLES[@]}"; do 
-		echo "Rebuilding table '$table_name' using query '${MYSQL_DB_CONTENT_TABLES["$table_name"]}'"; 
-	done
-}
-
-function database_rebuild_config(){
-	echo "Function not implemented... faking execution"
-	for collection_name in "${!MONGO_DB_CONFIG_COLLECTIONS[@]}"; do 
-		echo "Rebuilding collection $collection_name - ${MONGO_DB_CONFIG_COLLECTIONS["$collection_name"]}"; 
-	done
-
-	for table_name in "${!MYSQL_DB_CONFIG_TABLES[@]}"; do 
-		echo "Rebuilding table '$table_name' using query '${MYSQL_DB_CONFIG_TABLES["$table_name"]}'"; 
-	done
-}
-
-function database_add_missing(){
-	echo "Function not implemented... faking execution"
-	for collection_name in "${!MONGO_DB_CONFIG_COLLECTIONS[@]}"; do 
-		echo "Checking collection $collection_name - ${MONGO_DB_CONFIG_COLLECTIONS["$collection_name"]}"; 
-	done
-
-	for table_name in "${!MYSQL_DB_CONFIG_TABLES[@]}"; do 
-		echo "Checking table '$table_name' using query '${MYSQL_DB_CONFIG_TABLES["$table_name"]}'"; 
-	done
-}
-
-
-
-# Droppa e ricrea solo le tabelle dei dati
-function regenerate_db(){
-	EXDIR=`pwd`
-	cd "$APPLICATION_BINARY_PATH"
-	
-	./createDatabase
-	DBCONN=`./getDbConnectionString`
-	
-	QUERY="CREATE TABLE campagna (id bigint auto_increment PRIMARY KEY, nome VARCHAR(64), owner bigint not null, creation_date TIMESTAMP default CURRENT_TIMESTAMP, current boolean default false, deleted boolean default false)"
-	TABNAME="campagna"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	QUERY="CREATE TABLE personaggio ( id bigint auto_increment PRIMARY KEY, deleted boolean default false, campagna bigint, active boolean default true, nome varchar(128), giocatore varchar(128), vita_cur smallint, vita_max smallint, forza tinyint unsigned, destrezza tinyint unsigned, costituzione tinyint unsigned, intelligenza tinyint unsigned, saggezza tinyint unsigned, carisma tinyint unsigned, ts_tempra smallint, ts_tempra_note varchar(128), ts_riflessi smallint, ts_riflessi_note varchar(128), ts_volonta smallint, ts_volonta_note varchar(128), ca_base tinyint, ca_contatto tinyint, ca_sprovvista tinyint, iniziativa int not null default 0, ascoltare int, ascoltare_note varchar(128), cercare int, cercare_note varchar(128), diplomazia int, diplomazia_note varchar(128), muov_sil int, muov_sil_note varchar(128), nascondersi int, nascondersi_note varchar(128), osservare int, osservare_note varchar(128), perc_intenz int, perc_intenz_note varchar(128), raggirare int, raggirare_note varchar(128), valutare int, valutare_note varchar(128), conoscenze varchar(256), lingue varchar(256), melee_atk_short varchar(512), melee_atk_complete varchar(512), ranged_atk_short varchar(512), ranged_atk_complete varchar(512), unarmed_atk_short varchar(512), unarmed_atk_complete varchar(512), resist_incant smallint default 0, combat_note varchar(512), details TEXT, INDEX(campagna) )"
-	TABNAME="personaggio"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	
-	QUERY="CREATE TABLE npc( id bigint auto_increment PRIMARY KEY, deleted boolean default false, nome varchar(128), tipo varchar(128), dadi_vita smallint, vita_max smallint, allineamento varchar(32), grado_sfida smallint, forza tinyint unsigned, destrezza tinyint unsigned, costituzione tinyint unsigned, intelligenza tinyint unsigned, saggezza tinyint unsigned, carisma tinyint unsigned, ts_tempra smallint, ts_tempra_note varchar(128), ts_riflessi smallint, ts_riflessi_note varchar(128), ts_volonta smallint, ts_volonta_note varchar(128), ca_base tinyint, ca_contatto tinyint, ca_sprovvista tinyint, iniziativa int not null default 0, ascoltare int, ascoltare_note varchar(128), cercare int, cercare_note varchar(128), muov_sil int, muov_sil_note varchar(128), nascondersi int, nascondersi_note varchar(128), osservare int, osservare_note varchar(128), perc_intenz int, perc_intenz_note varchar(128), raggirare int, raggirare_note varchar(128), valutare int, valutare_note varchar(128), conoscenze varchar(256), lingue varchar(256), melee_atk_short varchar(512), melee_atk_complete varchar(512), ranged_atk_short varchar(512), ranged_atk_complete varchar(512), unarmed_atk_short varchar(512), unarmed_atk_complete varchar(512), resist_incant smallint default 0, combat_note varchar(512), details TEXT )"
-	TABNAME="npc"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	cd "$EXDIR"
-}
-
-# Droppa e ricrea le tabelle base (tipo admin e config)
-function regenerate_db_hard(){
-	EXDIR=`pwd`
-	cd "$APPLICATION_BINARY_PATH"
-	
-	./createDatabase
-	DBCONN=`./getDbConnectionString`
-	
-	
-	QUERY="CREATE TABLE general_configuration (config_key varchar(128) primary key, config_value varchar(128), INDEX(config_key))"
-	TABNAME="general_configuration"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	
-	QUERY="CREATE TABLE user (id bigint auto_increment PRIMARY KEY, login varchar(64) not null, password varchar(64) not null, last_session_id varchar(64) default null, is_admin boolean not null default false, INDEX(login), INDEX(last_session_id))"
-	TABNAME="user"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	
-	cd "$EXDIR"
-}
-
-
-
diff --git a/buildLibs~ b/buildLibs~
deleted file mode 100644
index b012e75..0000000
--- a/buildLibs~
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/bin/bash
-
-## Funzioni utilizzate da build
-
-#Stampa i comandi possibili
-function help() {
-	printf "\n"
-	printf "build [-h] -[ptl] -[DCcfs] [config_file]\n"
-	printf "\n"
-	printf "Specificare il config_file solo se non si desidera utilizzare quello di default.\n"
-	printf "E' obbligatorio specificare l'environment. In caso di environment multipli sarà utilizzato solo quello a priorità maggiore.\n"
-	printf "L'opzione default di database è -f (fix).\n"
-	printf "\n"
-	printf "Possibili valori di option\n"
-	printf "\t -h questa schermata\n"
-	printf "\n"
-	printf "Lista environment (per deployare la configurazione) in ordine di priorità\n"
-	printf "\t -p Produzione\n"
-	printf "\t -t Test\n"
-	printf "\t -l Locale\n"
-	printf "\n"
-	printf "Opzioni database\n"
-	printf "\t -D Droppa tutto il database e lo rebuilda\n"
-	printf "\t -C Droppa le tabelle di contenuti e le rebuilda\n"
-	printf "\t -c Droppa le tabelle di configurazione e le rebuilda\n"
-	printf "\t -f Aggiunge le tabelle mancanti\n"
-	printf "\t -s Skip db fix\n"
-}
-
-#Stampa il nome del comando in esecuzione
-function printcmd () {
-	printf "*-----------------------------------------*\n"
-	printf "   PROJECT:  $PROJECT_NAME\n"
-	printf "   EXECUTING: $1\n"
-	printf "\n"
-	printf "*-----------------------------------------*\n"
-}
-
-
-
-# Imposta come proprietario della cartella l'utente apache
-function chown_folder() {
-	if [[ -z "$1" ]] || [[ "$1" == "/" ]] || [[ "$1" == "./" ]]; then
-                exit 1
-	else
-		chown -R $APACHE2_USER:$APACHE2_GROUP "$1"
-	fi
-}
-
-function svncleanup() {
-	if [[ -z "$1" ]] || [[ "$1" == "/" ]] || [[ "$1" == "./" ]]; then
-		exit 1
-	else
-		for i in `find "$1" -name .svn`; 
-		do
-			printf  "Deleting .. $i\n"
-			rm -rf "$i"
-		done
-	fi
-}
-
-# Crea le cartelle di sistema
-function create_project_fs(){
-	# CREATES APPLICATION PRIVATE FOLDER
-	mkdir -p $APPLICATION_PRIVATE
-	chown_folder $APPLICATION_PRIVATE
-	
-	# CREATES APPLICATION PUBLIC FOLDER
-	mkdir -p $APPLICATION_PUBLIC
-	chown_folder $APPLICATION_PUBLIC
-
-	# CREATES APPLICATION STORAGE FOLDER
-	mkdir -p $APPLICATION_STORAGE
-	chown_folder $APPLICATION_STORAGE
-
-	# CREATES APPLICATION LOG FOLDER
-	mkdir -p $APPLICATION_LOG_PATH
-	chown_folder $APPLICATION_LOG_PATH
-
-	# CREATES XSENDFILE FOLDER
-	mkdir -p $APPLICATION_XSENDFILE_PATH
-	chown_folder $APPLICATION_XSENDFILE_PATH
-	
-	# CREATES APPLICATION MEDIA FOLDER
-	mkdir -p $APPLICATION_MEDIA_PATH
-	chown_folder $APPLICATION_MEDIA_PATH
-	
-	# CREATES APPLICATION BACKUP FOLDER
-	mkdir -p $APPLICATION_BACKUPS_PATH
-	chown_folder $APPLICATION_BACKUPS_PATH
-	
-	# CREATES APPLICATION TEMPORARY FOLDER
-	mkdir -p $APPLICATION_TMP_PATH
-	chown_folder $APPLICATION_TMP_PATH
-}
-
-
-# Deploya i sorgenti
-function deploy(){
-	echo "Deleting old build (Private)"
-	rm -rf "$APPLICATION_PRIVATE/*"
-
-	echo "Deleting old build (Public)"
-	rm -rf "$APPLICATION_PUBLIC/*"
-	
-
-	echo "Deploying new build (Private)"
-	cp -a "./private/"* "$APPLICATION_PRIVATE"
-	svncleanup "$APPLICATION_PRIVATE"
-	chown_folder "$APPLICATION_PRIVATE"
-	
-	echo "Deploying new build (Public)"
-	cp -a "./public/"* "$APPLICATION_PUBLIC"
-	svncleanup "$APPLICATION_PUBLIC"
-	chown_folder "$APPLICATION_PUBLIC"
-	
-
-	chmod -R a+x "$APPLICATION_BINARY_PATH"
-	chmod -R a+x "$APPLICATION_CRON_PATH"
-#	chmod -R a+x "$APPLICATION_TASK_PATH"
-}
-
-
-
-# Deploya il progetto e mantiene solo la configurazione di produzione
-function deploy_production_env(){
-	create_project_fs
-	deploy
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.local.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.local.php"
-	fi
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.test.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.test.php"
-	fi
-}
-
-# Deploya il progetto e mantiene solo la configurazione del server di test
-function deploy_test_env(){
-	create_project_fs
-	deploy
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.local.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.local.php"
-	fi
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.prod.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.prod.php"
-	fi
-}
-
-# Deploya il progetto e mantiene solo la configurazione locale
-function deploy_local_env(){
-	create_project_fs
-	deploy
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.prod.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.prod.php"
-	fi
-	if [[ -f "$APPLICATION_CONFIG_PATH/config.test.php" ]];then
-		rm "$APPLICATION_CONFIG_PATH/config.test.php"
-	fi
-}
-
-function database_rebuild_content(){
-	echo "Function not implemented... faking execution"
-	for collection_name in "${!MONGO_DB_CONTENT_COLLECTIONS[@]}"; do 
-		echo "Rebuilding collection $collection_name - ${MONGO_DB_CONTENT_COLLECTIONS["$collection_name"]}"; 
-	done
-
-	for table_name in "${!MYSQL_DB_CONTENT_TABLES[@]}"; do 
-		echo "Rebuilding table '$table_name' using query '${MYSQL_DB_CONTENT_TABLES["$table_name"]}'"; 
-	done
-}
-
-function database_rebuild_config(){
-	echo "Function not implemented... faking execution"
-	for collection_name in "${!MONGO_DB_CONFIG_COLLECTIONS[@]}"; do 
-		echo "Rebuilding collection $collection_name - ${MONGO_DB_CONFIG_COLLECTIONS["$collection_name"]}"; 
-	done
-
-	for table_name in "${!MYSQL_DB_CONFIG_TABLES[@]}"; do 
-		echo "Rebuilding table '$table_name' using query '${MYSQL_DB_CONFIG_TABLES["$table_name"]}'"; 
-	done
-}
-
-function database_add_missing(){
-	echo "Function not implemented... faking execution"
-	for collection_name in "${!MONGO_DB_CONFIG_COLLECTIONS[@]}"; do 
-		echo "Checking collection $collection_name - ${MONGO_DB_CONFIG_COLLECTIONS["$collection_name"]}"; 
-	done
-
-	for table_name in "${!MYSQL_DB_CONFIG_TABLES[@]}"; do 
-		echo "Checking table '$table_name' using query '${MYSQL_DB_CONFIG_TABLES["$table_name"]}'"; 
-	done
-}
-
-
-
-# Droppa e ricrea solo le tabelle dei dati
-function regenerate_db(){
-	EXDIR=`pwd`
-	cd "$APPLICATION_BINARY_PATH"
-	
-	./createDatabase
-	DBCONN=`./getDbConnectionString`
-	
-	QUERY="CREATE TABLE campagna (id bigint auto_increment PRIMARY KEY, nome VARCHAR(64), owner bigint not null, creation_date TIMESTAMP default CURRENT_TIMESTAMP, current boolean default false, deleted boolean default false)"
-	TABNAME="campagna"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	QUERY="CREATE TABLE personaggio ( id bigint auto_increment PRIMARY KEY, deleted boolean default false, campagna bigint, active boolean default true, nome varchar(128), giocatore varchar(128), vita_cur smallint, vita_max smallint, forza tinyint unsigned, destrezza tinyint unsigned, costituzione tinyint unsigned, intelligenza tinyint unsigned, saggezza tinyint unsigned, carisma tinyint unsigned, ts_tempra smallint, ts_tempra_note varchar(128), ts_riflessi smallint, ts_riflessi_note varchar(128), ts_volonta smallint, ts_volonta_note varchar(128), ca_base tinyint, ca_contatto tinyint, ca_sprovvista tinyint, iniziativa int not null default 0, ascoltare int, ascoltare_note varchar(128), cercare int, cercare_note varchar(128), diplomazia int, diplomazia_note varchar(128), muov_sil int, muov_sil_note varchar(128), nascondersi int, nascondersi_note varchar(128), osservare int, osservare_note varchar(128), perc_intenz int, perc_intenz_note varchar(128), raggirare int, raggirare_note varchar(128), valutare int, valutare_note varchar(128), conoscenze varchar(256), lingue varchar(256), melee_atk_short varchar(512), melee_atk_complete varchar(512), ranged_atk_short varchar(512), ranged_atk_complete varchar(512), unarmed_atk_short varchar(512), unarmed_atk_complete varchar(512), resist_incant smallint default 0, combat_note varchar(512), details TEXT, INDEX(campagna) )"
-	TABNAME="personaggio"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	
-	QUERY="CREATE TABLE npc( id bigint auto_increment PRIMARY KEY, deleted boolean default false, nome varchar(128), tipo varchar(128), dadi_vita smallint, vita_max smallint, allineamento varchar(32), grado_sfida smallint, forza tinyint unsigned, destrezza tinyint unsigned, costituzione tinyint unsigned, intelligenza tinyint unsigned, saggezza tinyint unsigned, carisma tinyint unsigned, ts_tempra smallint, ts_tempra_note varchar(128), ts_riflessi smallint, ts_riflessi_note varchar(128), ts_volonta smallint, ts_volonta_note varchar(128), ca_base tinyint, ca_contatto tinyint, ca_sprovvista tinyint, iniziativa int not null default 0, ascoltare int, ascoltare_note varchar(128), cercare int, cercare_note varchar(128), muov_sil int, muov_sil_note varchar(128), nascondersi int, nascondersi_note varchar(128), osservare int, osservare_note varchar(128), perc_intenz int, perc_intenz_note varchar(128), raggirare int, raggirare_note varchar(128), valutare int, valutare_note varchar(128), conoscenze varchar(256), lingue varchar(256), melee_atk_short varchar(512), melee_atk_complete varchar(512), ranged_atk_short varchar(512), ranged_atk_complete varchar(512), unarmed_atk_short varchar(512), unarmed_atk_complete varchar(512), resist_incant smallint default 0, combat_note varchar(512), details TEXT )"
-	TABNAME="npc"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	cd "$EXDIR"
-}
-
-# Droppa e ricrea le tabelle base (tipo admin e config)
-function regenerate_db_hard(){
-	EXDIR=`pwd`
-	cd "$APPLICATION_BINARY_PATH"
-	
-	./createDatabase
-	DBCONN=`./getDbConnectionString`
-	
-	
-	QUERY="CREATE TABLE general_configuration (config_key varchar(128) primary key, config_value varchar(128), INDEX(config_key))"
-	TABNAME="general_configuration"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	
-	QUERY="CREATE TABLE user (id bigint auto_increment PRIMARY KEY, login varchar(64) not null, password varchar(64) not null, last_session_id varchar(64) default null, is_admin boolean not null default false, INDEX(login), INDEX(last_session_id))"
-	TABNAME="user"
-	EXISTS=`echo "show tables" | $DBCONN  | grep "$TABNAME" | wc -l`
-	if [[ "$EXISTS" -gt 0 ]];then
-		echo "Dropping table $TABNAME"
-		echo "DROP TABLE $TABNAME" | $DBCONN
-	fi
-	echo "Executing query '$QUERY'"
-	echo $QUERY | $DBCONN
-	
-	
-	cd "$EXDIR"
-}
-
-
-
diff --git a/cicd/docker-compose.yml b/cicd/docker-compose.yml
new file mode 100644
index 0000000..a01b028
--- /dev/null
+++ b/cicd/docker-compose.yml
@@ -0,0 +1,65 @@
+version: "3"
+services:
+  mongo:
+    image: mongo:4.4.0
+    restart: "no"
+    networks:
+      db-network:
+        aliases:
+          - §PROJECT_BUILDNAME§.§ENVIRONMENT_TYPE§.database
+    volumes:
+      - §PROJECT_BUILDNAME§-db-persist:/usr/local/mongodb
+  webserver:
+    image: §PROJECT_REPOSITORY§/§PROJECT_GROUP§/§PROJECT_BUILDNAME§:§TAG_NAME§
+    env_file:
+    - environments/common/webserver.env
+    - environments/local/webserver.env
+    restart: "no"
+    ports:
+      - "8800:80"
+    networks:
+      db-network:
+      §PROJECT_BUILDNAME§-network:
+    links:
+      - mongo:database
+    volumes:
+      - §PROJECT_BUILDNAME§-storage:/home/§PROJECT_AUTHOR§/storage/§PROJECT_BUILDNAME§
+      - §PROJECT_BUILDNAME§-log:/var/log/§PROJECT_AUTHOR§/
+      - §DEBUG_HOST_PROJECT_FOLDER§/app/public:/var/www/§PROJECT_BUILDNAME§:ro
+      - §DEBUG_HOST_PROJECT_FOLDER§/app/private:/home/§PROJECT_AUTHOR§/private/§PROJECT_BUILDNAME§:ro
+      - §PROJECT_BUILDNAME§-job-comms:/jobComunication/
+  # worker:
+  #   image: 662348923997.dkr.ecr.eu-west-1.amazonaws.com/§PROJECT_GROUP§/edenlandia-worker:§TAG_NAME§
+  #   env_file: worker.env
+  #   restart: "no"
+  #   networks:
+  #     db-network:
+  #     §PROJECT_BUILDNAME§-network:
+  #   links:
+  #     - mongo:database
+  #   volumes:
+  #     - §PROJECT_BUILDNAME§-storage:/home/asdynamics/storage/edenlandia-worker
+  #     - edenlandia-worker-log:/var/log/asdynamics/
+  #     - ~/workspace-azzurro/webapps/edenlandia-worker/app/private:/home/asdynamics/private/§PROJECT_BUILDNAME§:ro
+  #     - §PROJECT_BUILDNAME§-job-comms:/jobComunication/
+  memcached:
+    image: memcached:1.6.9-alpine
+    restart: "no"
+    networks:
+      §PROJECT_BUILDNAME§-network:
+
+networks:
+  nginx-network:
+    external: 
+      name: 
+        nginx-network
+  db-network:
+  §PROJECT_BUILDNAME§-network:
+
+
+volumes:
+  §PROJECT_BUILDNAME§-storage:
+  §PROJECT_BUILDNAME§-log:
+  # edenlandia-worker-log:
+  §PROJECT_BUILDNAME§-db-persist:
+  §PROJECT_BUILDNAME§-job-comms:
\ No newline at end of file
diff --git a/cicd/docker-compose/local-live.yml b/cicd/docker-compose/local-live.yml
new file mode 100644
index 0000000..720aecb
--- /dev/null
+++ b/cicd/docker-compose/local-live.yml
@@ -0,0 +1,65 @@
+version: "3"
+services:
+  mongo:
+    image: mongo:4.4.0
+    restart: "no"
+    networks:
+      db-network:
+        aliases:
+          - §PROJECT_BUILDNAME§.§ENVIRONMENT_TYPE§.database
+    volumes:
+      - §PROJECT_BUILDNAME§-db-persist:/usr/local/mongodb
+  webserver:
+    image: §PROJECT_REPOSITORY§/§PROJECT_GROUP§/§PROJECT_BUILDNAME§:§TAG_NAME§-debug
+    env_file:
+    - environments/common/webserver.env
+    - environments/local/webserver.env
+    restart: "no"
+    ports:
+      - "8800:80"
+    networks:
+      db-network:
+      §PROJECT_BUILDNAME§-network:
+    links:
+      - mongo:database
+    volumes:
+      - §PROJECT_BUILDNAME§-storage:/home/§PROJECT_AUTHOR§/storage/§PROJECT_BUILDNAME§
+      - §PROJECT_BUILDNAME§-log:/var/log/§PROJECT_AUTHOR§/
+      - §DEBUG_HOST_PROJECT_FOLDER§/app/public:/var/www/§PROJECT_BUILDNAME§:ro
+      - §DEBUG_HOST_PROJECT_FOLDER§/app/private:/home/§PROJECT_AUTHOR§/private/§PROJECT_BUILDNAME§:ro
+      - §PROJECT_BUILDNAME§-job-comms:/jobComunication/
+  # worker:
+  #   image: 662348923997.dkr.ecr.eu-west-1.amazonaws.com/§PROJECT_GROUP§/edenlandia-worker:§TAG_NAME§
+  #   env_file: worker.env
+  #   restart: "no"
+  #   networks:
+  #     db-network:
+  #     §PROJECT_BUILDNAME§-network:
+  #   links:
+  #     - mongo:database
+  #   volumes:
+  #     - §PROJECT_BUILDNAME§-storage:/home/asdynamics/storage/edenlandia-worker
+  #     - edenlandia-worker-log:/var/log/asdynamics/
+  #     - ~/workspace-azzurro/webapps/edenlandia-worker/app/private:/home/asdynamics/private/§PROJECT_BUILDNAME§:ro
+  #     - §PROJECT_BUILDNAME§-job-comms:/jobComunication/
+  memcached:
+    image: memcached:1.6.9-alpine
+    restart: "no"
+    networks:
+      §PROJECT_BUILDNAME§-network:
+
+networks:
+  nginx-network:
+    external: 
+      name: 
+        nginx-network
+  db-network:
+  §PROJECT_BUILDNAME§-network:
+
+
+volumes:
+  §PROJECT_BUILDNAME§-storage:
+  §PROJECT_BUILDNAME§-log:
+  # edenlandia-worker-log:
+  §PROJECT_BUILDNAME§-db-persist:
+  §PROJECT_BUILDNAME§-job-comms:
\ No newline at end of file
diff --git a/cicd/dockerfiles/build.dockerfile b/cicd/dockerfiles/build.dockerfile
new file mode 100644
index 0000000..8e6611e
--- /dev/null
+++ b/cicd/dockerfiles/build.dockerfile
@@ -0,0 +1,37 @@
+# Use a PHP runtime as a parent image
+FROM §FRAMEWORK_REPOSITORY§/§FRAMEWORK_IMAGE§:§FRAMEWORK_VERSION§-§FRAMEWORK_TYPE§
+
+# Set the working directory to /app
+WORKDIR /§PROJECT_BUILDNAME§
+
+# Install GD (required by mpdf)
+RUN apt-get update && \
+	apt-get install -yq --no-install-recommends libpng-dev zlib1g-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+RUN docker-php-ext-install gd
+
+# Install Memcached
+RUN apt-get update && apt-get install -y libmemcached-dev \
+    && pecl install memcached-3.1.5 \
+    && docker-php-ext-enable memcached
+
+# Copy the current directory contents into the container at /app
+COPY ./app /§PROJECT_BUILDNAME§
+
+COPY ./version /§PROJECT_BUILDNAME§
+
+COPY ./config /§PROJECT_BUILDNAME§
+
+COPY ./install /§PROJECT_BUILDNAME§
+
+RUN chmod 744 /§PROJECT_BUILDNAME§/install
+
+RUN /§PROJECT_BUILDNAME§/install
+
+
+ENTRYPOINT ["§PROJECT_BUILDNAME§-entrypoint"]
+
+# Make port 80 available to the world outside this container
+EXPOSE 80
+
diff --git a/cicd/dockerfiles/debug.dockerfile b/cicd/dockerfiles/debug.dockerfile
new file mode 100644
index 0000000..aecc05d
--- /dev/null
+++ b/cicd/dockerfiles/debug.dockerfile
@@ -0,0 +1,35 @@
+# Use a PHP runtime as a parent image
+FROM §FRAMEWORK_REPOSITORY§/§FRAMEWORK_IMAGE§:§FRAMEWORK_VERSION§-§FRAMEWORK_TYPE§
+
+# Set the working directory to /app
+WORKDIR /§PROJECT_BUILDNAME§
+
+# Install XDebug
+RUN pecl install xdebug | tail -n 1 | awk -F"\"" '{print $2}' > /usr/local/etc/php/conf.d/xdebug.ini
+RUN echo "\n\n[XDebug]\nxdebug.mode=debug\nxdebug.start_with_request=yes\nxdebug.client_host = §DEBUG_REMOTE_IP§\nxdebug.client_port = §DEBUG_REMOTE_PORT§\n" >> /usr/local/etc/php/conf.d/xdebug.ini
+
+# Install Memcached
+RUN apt-get update && apt-get install -y libmemcached-dev zlib1g-dev \
+    && pecl install memcached-3.1.5 \
+    && docker-php-ext-enable memcached
+
+# Install SOAP
+RUN docker-php-ext-install soap
+	
+# Copy the current directory contents into the container at /app
+COPY ./app /§PROJECT_BUILDNAME§
+
+COPY ./version /§PROJECT_BUILDNAME§
+
+COPY ./config /§PROJECT_BUILDNAME§
+
+COPY ./install /§PROJECT_BUILDNAME§
+
+RUN chmod 744 /§PROJECT_BUILDNAME§/install
+
+RUN /§PROJECT_BUILDNAME§/install
+
+ENTRYPOINT ["§PROJECT_BUILDNAME§-entrypoint"]
+
+# Make port 80 available to the world outside this container
+EXPOSE 80
diff --git a/cicd/dockerfiles/test.dockerfile b/cicd/dockerfiles/test.dockerfile
new file mode 100644
index 0000000..994734f
--- /dev/null
+++ b/cicd/dockerfiles/test.dockerfile
@@ -0,0 +1,15 @@
+FROM §FRAMEWORK_REPOSITORY§/§FRAMEWORK_IMAGE§:§FRAMEWORK_VERSION§-§FRAMEWORK_TYPE§-unit
+
+WORKDIR /§PROJECT_BUILDNAME§
+COPY ./app /§PROJECT_BUILDNAME§
+COPY ./test /test§PROJECT_BUILDNAME§
+COPY ./version /§PROJECT_BUILDNAME§
+COPY ./config /§PROJECT_BUILDNAME§
+COPY ./test/install /§PROJECT_BUILDNAME§
+
+RUN chmod 744 /§PROJECT_BUILDNAME§/install
+
+RUN /§PROJECT_BUILDNAME§/install
+
+ENTRYPOINT ["/usr/local/bin/phpunit"]
+CMD ["--help"]
diff --git a/cicd/environments/common/webserver.env b/cicd/environments/common/webserver.env
new file mode 100644
index 0000000..e491c56
--- /dev/null
+++ b/cicd/environments/common/webserver.env
@@ -0,0 +1,2 @@
+ASD_PROJECTNAME=FDN2
+ASD_BUILDNAME=fdn2
diff --git a/cicd/environments/local/webserver.env b/cicd/environments/local/webserver.env
new file mode 100644
index 0000000..3861489
--- /dev/null
+++ b/cicd/environments/local/webserver.env
@@ -0,0 +1,7 @@
+ASD_ENVIRONMENT_NAME=local
+ASD_IS_PRODUCTION=false
+
+ASD_MONGO_DBNAME=fdn2
+ASD_MONGO_LOCATION=database
+
+ASD_PUBLIC_URL=http://local.fdn2.loc:8800
diff --git a/config b/config
new file mode 100644
index 0000000..a71baea
--- /dev/null
+++ b/config
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+declare -A CONFIG=(
+    ["FRAMEWORK_REPOSITORY"]="299952237278.dkr.ecr.eu-west-1.amazonaws.com"
+    ["FRAMEWORK_IMAGE"]="ddninja/phpframework"
+    ["FRAMEWORK_VERSION"]="2.5.4"
+    ["FRAMEWORK_TYPE"]="webserver"
+    ["FRAMEWORK_AUTHOR"]="ddninja"
+
+    ["PROJECT_REPOSITORY"]="299952237278.dkr.ecr.eu-west-1.amazonaws.com"
+    ["PROJECT_GROUP"]="work"
+    ["PROJECT_BUILDNAME"]="fdn2"
+    ["PROJECT_TYPE"]="guiapi"
+    ["PROJECT_AUTHOR"]="ddninja"
+
+    # DEBUG
+    ["DEBUG_REMOTE_IP"]="10.0.0.2"
+    ["DEBUG_REMOTE_PORT"]="9090"
+
+    ["DEBUG_HOST_PROJECT_FOLDER"]=`dirname $(realpath "${BASH_SOURCE[0]}")`
+)
+
+FRAMEWORK_REPOSITORY=${CONFIG['FRAMEWORK_REPOSITORY']}
+FRAMEWORK_IMAGE=${CONFIG['FRAMEWORK_IMAGE']}
+FRAMEWORK_VERSION=${CONFIG['FRAMEWORK_VERSION']}
+FRAMEWORK_TYPE=${CONFIG['FRAMEWORK_TYPE']}
+FRAMEWORK_AUTHOR=${CONFIG['FRAMEWORK_AUTHOR']}
+
+PROJECT_REPOSITORY=${CONFIG['PROJECT_REPOSITORY']}
+PROJECT_GROUP=${CONFIG['PROJECT_GROUP']}
+PROJECT_BUILDNAME=${CONFIG['PROJECT_BUILDNAME']}
+PROJECT_TYPE=${CONFIG['PROJECT_TYPE']}
+PROJECT_AUTHOR=${CONFIG['PROJECT_AUTHOR']}
+
+DEBUG_REMOTE_IP=${CONFIG['DEBUG_REMOTE_IP']}
+DEBUG_REMOTE_PORT=${CONFIG['DEBUG_REMOTE_PORT']}
+DEBUG_HOST_PROJECT_FOLDER=${CONFIG['DEBUG_HOST_PROJECT_FOLDER']}
+
diff --git a/dbCreation.mongo b/dbCreation.mongo
deleted file mode 100644
index 2467de6..0000000
--- a/dbCreation.mongo
+++ /dev/null
@@ -1,3 +0,0 @@
-content => persone => persone
-content => luoghi => luoghi
-config => configuration => the_configuration
\ No newline at end of file
diff --git a/dbCreation.mysql b/dbCreation.mysql
deleted file mode 100644
index 24cb689..0000000
--- a/dbCreation.mysql
+++ /dev/null
@@ -1,3 +0,0 @@
-content => tizi => create table tizi
-content => posti => create table posti
-config => configz => create table configz
\ No newline at end of file
diff --git a/oth/img/FrecciaBellissima.xcf b/docs/img/FrecciaBellissima.xcf
similarity index 100%
rename from oth/img/FrecciaBellissima.xcf
rename to docs/img/FrecciaBellissima.xcf
diff --git a/oth/img/Icon.xcf b/docs/img/Icon.xcf
similarity index 100%
rename from oth/img/Icon.xcf
rename to docs/img/Icon.xcf
diff --git a/oth/img/UnderConstruction.xcf b/docs/img/UnderConstruction.xcf
similarity index 100%
rename from oth/img/UnderConstruction.xcf
rename to docs/img/UnderConstruction.xcf
diff --git a/oth/img/blueBalls.xcf b/docs/img/blueBalls.xcf
similarity index 100%
rename from oth/img/blueBalls.xcf
rename to docs/img/blueBalls.xcf
diff --git a/oth/img/cronaca.jpg b/docs/img/cronaca.jpg
similarity index 100%
rename from oth/img/cronaca.jpg
rename to docs/img/cronaca.jpg
diff --git a/oth/img/header.png b/docs/img/header.png
similarity index 100%
rename from oth/img/header.png
rename to docs/img/header.png
diff --git a/oth/img/header.xcf b/docs/img/header.xcf
similarity index 100%
rename from oth/img/header.xcf
rename to docs/img/header.xcf
diff --git a/oth/img/headerAdmin.png b/docs/img/headerAdmin.png
similarity index 100%
rename from oth/img/headerAdmin.png
rename to docs/img/headerAdmin.png
diff --git a/oth/img/headerAdmin.xcf b/docs/img/headerAdmin.xcf
similarity index 100%
rename from oth/img/headerAdmin.xcf
rename to docs/img/headerAdmin.xcf
diff --git a/oth/img/imageArrow.xcf b/docs/img/imageArrow.xcf
similarity index 100%
rename from oth/img/imageArrow.xcf
rename to docs/img/imageArrow.xcf
diff --git a/oth/img/index_final.jpg b/docs/img/index_final.jpg
similarity index 100%
rename from oth/img/index_final.jpg
rename to docs/img/index_final.jpg
diff --git a/oth/img/leftArrow.xcf b/docs/img/leftArrow.xcf
similarity index 100%
rename from oth/img/leftArrow.xcf
rename to docs/img/leftArrow.xcf
diff --git a/oth/img/logo.svg b/docs/img/logo.svg
similarity index 100%
rename from oth/img/logo.svg
rename to docs/img/logo.svg
diff --git a/oth/img/magnifyingGlass.xcf b/docs/img/magnifyingGlass.xcf
similarity index 100%
rename from oth/img/magnifyingGlass.xcf
rename to docs/img/magnifyingGlass.xcf
diff --git a/oth/img/menuBackground.xcf b/docs/img/menuBackground.xcf
similarity index 100%
rename from oth/img/menuBackground.xcf
rename to docs/img/menuBackground.xcf
diff --git a/oth/img/minoImg/Oggetto_vettoriale_avanzato_copia.png b/docs/img/minoImg/Oggetto_vettoriale_avanzato_copia.png
similarity index 100%
rename from oth/img/minoImg/Oggetto_vettoriale_avanzato_copia.png
rename to docs/img/minoImg/Oggetto_vettoriale_avanzato_copia.png
diff --git a/oth/img/minoImg/Senza titolo-2.svg b/docs/img/minoImg/Senza titolo-2.svg
similarity index 100%
rename from oth/img/minoImg/Senza titolo-2.svg
rename to docs/img/minoImg/Senza titolo-2.svg
diff --git a/oth/img/minoImg/ads_central.png b/docs/img/minoImg/ads_central.png
similarity index 100%
rename from oth/img/minoImg/ads_central.png
rename to docs/img/minoImg/ads_central.png
diff --git a/oth/img/minoImg/ads_long.png b/docs/img/minoImg/ads_long.png
similarity index 100%
rename from oth/img/minoImg/ads_long.png
rename to docs/img/minoImg/ads_long.png
diff --git a/oth/img/minoImg/back_menu.png b/docs/img/minoImg/back_menu.png
similarity index 100%
rename from oth/img/minoImg/back_menu.png
rename to docs/img/minoImg/back_menu.png
diff --git a/oth/img/minoImg/img.jpg b/docs/img/minoImg/img.jpg
similarity index 100%
rename from oth/img/minoImg/img.jpg
rename to docs/img/minoImg/img.jpg
diff --git a/oth/img/minoImg/img1.jpg b/docs/img/minoImg/img1.jpg
similarity index 100%
rename from oth/img/minoImg/img1.jpg
rename to docs/img/minoImg/img1.jpg
diff --git a/oth/img/minoImg/img2.jpg b/docs/img/minoImg/img2.jpg
similarity index 100%
rename from oth/img/minoImg/img2.jpg
rename to docs/img/minoImg/img2.jpg
diff --git a/oth/img/minoImg/img_big.png b/docs/img/minoImg/img_big.png
similarity index 100%
rename from oth/img/minoImg/img_big.png
rename to docs/img/minoImg/img_big.png
diff --git a/oth/img/minoImg/img_category.jpg b/docs/img/minoImg/img_category.jpg
similarity index 100%
rename from oth/img/minoImg/img_category.jpg
rename to docs/img/minoImg/img_category.jpg
diff --git a/oth/img/minoImg/img_central.png b/docs/img/minoImg/img_central.png
similarity index 100%
rename from oth/img/minoImg/img_central.png
rename to docs/img/minoImg/img_central.png
diff --git a/oth/img/minoImg/img_ct1.jpg b/docs/img/minoImg/img_ct1.jpg
similarity index 100%
rename from oth/img/minoImg/img_ct1.jpg
rename to docs/img/minoImg/img_ct1.jpg
diff --git a/oth/img/minoImg/img_gossip.png b/docs/img/minoImg/img_gossip.png
similarity index 100%
rename from oth/img/minoImg/img_gossip.png
rename to docs/img/minoImg/img_gossip.png
diff --git a/oth/img/minoImg/img_rist.png b/docs/img/minoImg/img_rist.png
similarity index 100%
rename from oth/img/minoImg/img_rist.png
rename to docs/img/minoImg/img_rist.png
diff --git a/oth/img/minoImg/imgbig.jpg b/docs/img/minoImg/imgbig.jpg
similarity index 100%
rename from oth/img/minoImg/imgbig.jpg
rename to docs/img/minoImg/imgbig.jpg
diff --git a/oth/img/minoImg/logo.png b/docs/img/minoImg/logo.png
similarity index 100%
rename from oth/img/minoImg/logo.png
rename to docs/img/minoImg/logo.png
diff --git a/oth/img/minoImg/logo_svg.svg b/docs/img/minoImg/logo_svg.svg
similarity index 100%
rename from oth/img/minoImg/logo_svg.svg
rename to docs/img/minoImg/logo_svg.svg
diff --git a/oth/img/minoImg/title.png b/docs/img/minoImg/title.png
similarity index 100%
rename from oth/img/minoImg/title.png
rename to docs/img/minoImg/title.png
diff --git a/oth/img/minoImg/title_green.png b/docs/img/minoImg/title_green.png
similarity index 100%
rename from oth/img/minoImg/title_green.png
rename to docs/img/minoImg/title_green.png
diff --git a/oth/img/minoImg/title_yellow.png b/docs/img/minoImg/title_yellow.png
similarity index 100%
rename from oth/img/minoImg/title_yellow.png
rename to docs/img/minoImg/title_yellow.png
diff --git a/oth/img/politica.jpg b/docs/img/politica.jpg
similarity index 100%
rename from oth/img/politica.jpg
rename to docs/img/politica.jpg
diff --git a/oth/img/psd/cronaca.psd b/docs/img/psd/cronaca.psd
similarity index 100%
rename from oth/img/psd/cronaca.psd
rename to docs/img/psd/cronaca.psd
diff --git a/oth/img/psd/index_final.psd b/docs/img/psd/index_final.psd
similarity index 100%
rename from oth/img/psd/index_final.psd
rename to docs/img/psd/index_final.psd
diff --git a/oth/img/psd/politica.psd b/docs/img/psd/politica.psd
similarity index 100%
rename from oth/img/psd/politica.psd
rename to docs/img/psd/politica.psd
diff --git a/oth/img/stampa.xcf b/docs/img/stampa.xcf
similarity index 100%
rename from oth/img/stampa.xcf
rename to docs/img/stampa.xcf
diff --git a/oth/docs/listaCategorie.txt b/docs/listaCategorie.txt
similarity index 100%
rename from oth/docs/listaCategorie.txt
rename to docs/listaCategorie.txt
diff --git a/oldFdnUtils/.htaccess b/docs/tech/.htaccess
similarity index 100%
rename from oldFdnUtils/.htaccess
rename to docs/tech/.htaccess
diff --git a/oth/OSConfig/crontab b/docs/tech/crontab
similarity index 100%
rename from oth/OSConfig/crontab
rename to docs/tech/crontab
diff --git a/oth/docs/install.memo b/docs/tech/install.memo
similarity index 88%
rename from oth/docs/install.memo
rename to docs/tech/install.memo
index 72e70e1..34920ed 100644
--- a/oth/docs/install.memo
+++ b/docs/tech/install.memo
@@ -27,3 +27,6 @@ db.notizia.createIndex({"about.data": 1, "status":1, "isAnsa":1,"about.lastEdit"
 db.statistics.createIndex({statType:1,deleted:1,date:1})
 db.statistics.createIndex({"user.id":1})
 db.statistics.createIndex({"stat.type":1,"content.position":1})
+
+
+db.notizia.ensureIndex({"about.author": "text",sottotitolo: "text",testo: "text",titolo: "text"},{weights: {"about.author": 1,sottotitolo: 7,testo: 5,titolo: 10},name: "notiziaDetails"})
\ No newline at end of file
diff --git a/modifichePhpini b/docs/tech/modifichePhpini
similarity index 100%
rename from modifichePhpini
rename to docs/tech/modifichePhpini
diff --git a/install b/install
new file mode 100644
index 0000000..f5fc21b
--- /dev/null
+++ b/install
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+my_dir="$(dirname "$0")"
+DIR_RETURN=`pwd`
+
+cd "$my_dir"
+
+source ./config
+
+# Create paths
+mkdir -p "/var/www/$PROJECT_BUILDNAME"
+mkdir -p /home/$PROJECT_AUTHOR/{private,storage}/$PROJECT_BUILDNAME
+mkdir -p /var/log/$PROJECT_AUTHOR/$PROJECT_BUILDNAME
+
+# Copy application
+cp -r ./public/* /var/www/$PROJECT_BUILDNAME/
+cp -r ./private/* /home/$PROJECT_AUTHOR/private/$PROJECT_BUILDNAME/
+
+# Chown stuff
+chown -R www-data:www-data /var/www/$PROJECT_BUILDNAME
+chown -R www-data:www-data /home/$PROJECT_AUTHOR
+chown -R www-data:www-data /var/log/$PROJECT_AUTHOR
+
+# Make bin executables
+chmod 0744 /home/$PROJECT_AUTHOR/private/$PROJECT_BUILDNAME/bin/*
+
+# Apache
+cat ./os/000-${PROJECT_TYPE}.template.conf | 
+	sed -e "s/§PROJECT_BUILDNAME§/${PROJECT_BUILDNAME}/g" \
+	> /etc/apache2/sites-available/000-default.conf
+
+a2enmod rewrite
+
+# Overwrite opcache default config
+cat ./os/opcache.template.ini | 
+	sed -e "s/§PROJECT_BUILDNAME§/${PROJECT_BUILDNAME}/g" \
+	> /usr/local/etc/php/conf.d/opcache.ini
+
+# Add config to php.ini
+cat ./os/php.template.ini > /usr/local/etc/php/php.ini
+
+# Generate Entrypoint
+cp "./os/webserver-entrypoint" "/usr/local/bin/$PROJECT_BUILDNAME-entrypoint"
+chmod 0744 /usr/local/bin/$PROJECT_BUILDNAME-entrypoint
+
+
+cd "$DIR_RETURN"
diff --git a/oth/docs/memo/commentiCollection.txt b/oth/docs/memo/commentiCollection.txt
deleted file mode 100644
index 1cbd4f8..0000000
--- a/oth/docs/memo/commentiCollection.txt
+++ /dev/null
@@ -1 +0,0 @@
-commenti{notizia,status}
\ No newline at end of file
diff --git a/oth/docs/memo/mediaCollection.txt b/oth/docs/memo/mediaCollection.txt
deleted file mode 100644
index b28b04f..0000000
--- a/oth/docs/memo/mediaCollection.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/oth/docs/memo/mediaRenderer.txt b/oth/docs/memo/mediaRenderer.txt
deleted file mode 100644
index f411310..0000000
--- a/oth/docs/memo/mediaRenderer.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MediaLocalVideo,MediaImage,Mediapdf {path}
-MediaYoutube {link}
-MediaHtml5 {code}
\ No newline at end of file
diff --git a/oth/docs/memo/notiziaCollection.txt b/oth/docs/memo/notiziaCollection.txt
deleted file mode 100644
index db0c8f7..0000000
--- a/oth/docs/memo/notiziaCollection.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"titolo":"",
-	"sottotitolo":"",
-	"testo":"",
-	"category":"",
-	"isAnsa":false,
-	"about":{
-		"author":"",
-		"date":"",
-		"owner":""
-	}
-	"mediaReference" = array(),
-	"deleted" : false,
-	"mainMedia":null,
-	"sondaggio":{
-		"titolo":"fgsgfsd",
-		"voci":[
-			{"nome":"Mi Piace", "voti":6},
-			{"nome":"Non mi piace","voti":2}
-		],
-		"votanti":["asndijansidj","sadmas","asdas"]
-	}
-}
\ No newline at end of file
diff --git a/oth/techUtils.txt b/oth/techUtils.txt
deleted file mode 100644
index a3f6c83..0000000
--- a/oth/techUtils.txt
+++ /dev/null
@@ -1 +0,0 @@
-db.notizia.ensureIndex({"about.author": "text",sottotitolo: "text",testo: "text",titolo: "text"},{weights: {"about.author": 1,sottotitolo: 7,testo: 5,titolo: 10},name: "notiziaDetails"})
\ No newline at end of file
diff --git a/private/common/config.local.php b/private/common/config.local.php
deleted file mode 100644
index eb8fe80..0000000
--- a/private/common/config.local.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/*
-Author: 		Riccardo Di Dato
-Creation Date:	07/gen/2016
-*/
-
-// $dbconn = new DatabaseConnection();
-// $dbconn->dbname = "cbs";
-// $dbconn->dbtype = "mysql";
-// $dbconn->location = "localhost";
-// $dbconn->username = "root";
-// $dbconn->password = "root";
-$database = new stdClass();
-$database->dbName = "fdn2";
-$database->user = "test";
-$database->pass = "test";
-$database->useAuth = false;
-$database->connectionString = "mongodb://127.0.0.1:27017";
-
-$currentSystem = new stdClass();
-$currentSystem->storageBaseDir 		= "/home/asdynamics/storage";				// Il path con storage ecc in cui mettere i contenuti dell'applicazione (immagini, dump db ecc)
-$currentSystem->privateBaseDir		= "/home/asdynamics/private";	// Il path in cui inserire la cartella con lib, task, binari ecc
-$currentSystem->tmpBaseDir			= "/tmp/asdynamics";
-$currentSystem->logBaseDir 			= "/var/log/asdynamics";			// Il path dei log....
-$currentSystem->xSendFileDir		= "/tmp/xsend";
-
-// $currentSystem->safeStorage			= "/home/cbs/storage";
-
-$currentSystem->apache = new StdClass();
-$currentSystem->apache->user 		= "var-www";
-$currentSystem->apache->group 		= "var-www";
-$currentSystem->apache->workdir		= "/var/www"; // Il path in cui inserire la cartella con le pagine html
-
-$currentSystem->remoteLocationPath = "http://10.0.0.64/fdn2/";
-// 	$currentSystem->remoteLocationPath = "http://192.168.1.129/fdn2/";
-
-$backupSystem = new stdClass();
-$backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267";
-$backupSystem->passphrase = "a54af48c2ec44bba903666b6d12290750178154a6965c9165d3b387e7fd0f14c5f2d62cb93f468be640d469c80f1260feed3ad98f5f52d52c045b0487e59981bf365f4037f6c7cb93572cdd5d20daeb8185afcc65dba1bd2067829f827d9b795451f6e5e8fafe5e1fbe29675feb93e7d208a6b53a14df5aeec62d97fbf34d56a";
-
-$cbs2 = new stdClass();
-$cbs2->keyfile = "id_rsa_cbs_local";
-$cbs2->serverPort = "22";
-
-// $config->locations = new stdClass();
-
-// $config->application->applicationInterfacePath = "/tnc15";
-
-// $config->application->systemTmp = "/tmp";
-
-?>
diff --git a/scripts/aws-login.sh b/scripts/aws-login.sh
new file mode 100755
index 0000000..89fa6b4
--- /dev/null
+++ b/scripts/aws-login.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Logs in the local docker to ECR so it can push and pull images.
+# Works for both aws cli versions (1 and 2 )
+
+IS_V2=`aws --version | grep -P "^aws-cli/2" | wc -l`
+
+if [[ $IS_V2 -eq "1" ]]; then 
+    aws ecr get-login-password --region eu-west-1 | docker login --username AWS --password-stdin 299952237278.dkr.ecr.eu-west-1.amazonaws.com
+else
+    $(aws ecr get-login --no-include-email)
+fi
diff --git a/scripts/build.sh b/scripts/build.sh
new file mode 100755
index 0000000..e392855
--- /dev/null
+++ b/scripts/build.sh
@@ -0,0 +1,116 @@
+#!/bin/bash
+######
+# This script builds the docker image locally
+# It expects docker to be logged in to ECR (see aws-login)
+
+set -e
+
+VERBOSE=0
+
+DIR=`dirname $(realpath "${BASH_SOURCE[0]}")`
+OLDDIR=`pwd`
+cd "$DIR"
+
+source "$DIR/../config"
+source "$DIR/libs.sh"
+
+usage() {
+    echo "Usage: $0 [-h] [-v] [-t: version] [image type, see below] " 1>&2; 
+    echo "This script builds framework docker images, the following options are available:" 1>&2; 
+    echo "  -h: This message" 1>&2; 
+    echo "  Image types (at least one, otherwise the script does nothing)" 1>&2; 
+    echo "     -a: All, same as ub" 1>&2; 
+    echo "     -u: Unit" 1>&2; 
+    echo "     -b: Base" 1>&2; 
+    echo "     -d: Debug" 1>&2; 
+    echo "  -t: Project version, this will be used as base for the docker image tag (default: local)" 1>&2; 
+    echo "  -v: Verbose" 1>&2; 
+    exit 1;
+}
+
+BASE_MODE=0
+UNIT_MODE=0
+DEBUG_MODE=0
+
+TAG="local"
+
+while getopts "t:hvaubd" o; do
+    case "${o}" in
+        b)
+            BASE_MODE=1
+            ;;
+        u)
+            UNIT_MODE=1
+            ;;
+        d)
+            DEBUG_MODE=1
+            ;;
+        a)
+            BASE_MODE=1
+            UNIT_MODE=1
+            ;;
+        t)
+            TAG=${OPTARG}
+            ;;
+        v) 
+            VERBOSE=1
+            ;;
+        h) 
+            usage
+            ;;
+		*)
+            printerr "Unsupported option ${o}"
+			usage
+			;;
+    esac
+done
+
+
+
+cd ".."
+
+# STANDARD MODE
+if [[ $BASE_MODE -gt 0 ]]; then 
+    DOCKERFILE=`mktemp -t dockerfile.XXXXX`
+    msg "Generating base dockerfile '$DOCKERFILE'"
+    OPTS="b"
+    if [[ $VERBOSE -eq 1 ]]; then
+        OPTS+="v"
+    fi
+
+    $DIR/generateDockerfile.sh -$OPTS -o $DOCKERFILE
+
+    msg "Building project image $TAG"
+    docker build -t $PROJECT_REPOSITORY/$PROJECT_GROUP/$PROJECT_BUILDNAME:$TAG -f $DOCKERFILE .
+fi
+
+# UNIT MODE
+if [[ $UNIT_MODE -gt 0 ]]; then 
+    DOCKERFILE=`mktemp -t dockerfile.XXXXX`
+    msg "Generating unit dockerfile '$DOCKERFILE'"
+    OPTS="u"
+    if [[ $VERBOSE -eq 1 ]]; then
+        OPTS+="v"
+    fi
+
+    $DIR/generateDockerfile.sh -$OPTS -o $DOCKERFILE
+
+    msg "Building project image $TAG"
+    docker build -t $PROJECT_REPOSITORY/$PROJECT_GROUP/$PROJECT_BUILDNAME:$TAG-unit -f $DOCKERFILE .
+fi
+
+# DEBUG MODE
+if [[ $DEBUG_MODE -gt 0 ]]; then 
+    DOCKERFILE=`mktemp -t dockerfile.XXXXX`
+    msg "Generating debug dockerfile '$DOCKERFILE'"
+    OPTS="d"
+    if [[ $VERBOSE -eq 1 ]]; then
+        OPTS+="v"
+    fi
+
+    $DIR/generateDockerfile.sh -$OPTS -o $DOCKERFILE
+
+    msg "Building project image $TAG"
+    docker build -t $PROJECT_REPOSITORY/$PROJECT_GROUP/$PROJECT_BUILDNAME:$TAG-debug -f $DOCKERFILE .
+fi
+
diff --git a/scripts/core.sh b/scripts/core.sh
new file mode 100755
index 0000000..a98d862
--- /dev/null
+++ b/scripts/core.sh
@@ -0,0 +1,117 @@
+#!/bin/bash
+######
+# This script builds the docker image locally
+# It expects docker to be logged in to ECR (see aws-login)
+
+set -e
+
+VERBOSE=0
+
+DIR=`dirname $(realpath "${BASH_SOURCE[0]}")`
+OLDDIR=`pwd`
+cd "$DIR"
+
+source "$DIR/../config"
+source "$DIR/libs.sh"
+
+usage() {
+    echo "Usage: $0 [-h] [-v] [-t: version] [action(s), see below]" 1>&2; 
+    echo "This script builds framework docker images, the following options are available:" 1>&2; 
+    echo "  -h: This message" 1>&2; 
+    echo "  Actions" 1>&2; 
+    echo "     -u: Unit tests locally" 1>&2; 
+    echo "     -d: Run debug vesion locally" 1>&2; 
+    echo "     -p: Publish (requires a version)" 1>&2; 
+    echo "  -t: Software version, this will be used for the docker tag (default: local)" 1>&2; 
+    echo "  -v: Verbose" 1>&2; 
+    exit 1;
+}
+
+UNIT_MODE=0
+DEBUG_MODE=0
+PUBLISH_MODE=0
+SELECTED_MODES=0
+
+TAG="local"
+
+while getopts "t:hvudp" o; do
+    case "${o}" in
+        u)
+            UNIT_MODE=1
+            SELECTED_MODES+=1
+            ;;
+        d)
+            DEBUG_MODE=1
+            SELECTED_MODES+=1
+            ;;
+        p)
+            PUBLISH_MODE=1
+            SELECTED_MODES+=1
+            ;;
+        
+        t)
+            TAG=${OPTARG}
+            ;;
+        v) 
+            VERBOSE=1
+            ;;
+        h) 
+            usage
+            ;;
+		*)
+            printerr "Unsupported option ${o}"
+			usage
+			;;
+    esac
+done
+
+
+if [[ $SELECTED_MODES -ne 1 ]]; then 
+    printerr "Select only one mode"
+    usage
+fi
+
+if  [[ $UNIT_MODE -eq 1 ]]; then 
+    BUILDOPT+="u"
+    UNITOPT=""
+    if [[ $VERBOSE -gt 0 ]]; then
+        BUILDOPT+="v"
+        UNITOPT="-v"
+    fi
+    msg "running ./build.sh -$BUILDOPT -t $TAG"
+    ./build.sh -$BUILDOPT -t $TAG
+
+    ./run-unit.sh $UNITOPT -t $TAG
+fi
+
+if  [[ $PUBLISH_MODE -eq 1 ]]; then 
+    BUILDOPT+="bu"
+    VERBOPT=""
+    if [[ $VERBOSE -gt 0 ]]; then
+        BUILDOPT+="v"
+        VERBOPT="-v"
+    fi
+    msg "running ./build.sh -$BUILDOPT -t $TAG"
+    ./build.sh -$BUILDOPT -t $TAG
+
+    ./run-unit.sh $VERBOPT -t $TAG
+
+    ./publish.sh $VERBOPT -t $TAG
+fi
+
+
+if  [[ $DEBUG_MODE -eq 1 ]]; then 
+    BUILDOPT+="d"
+    if [[ $VERBOSE -gt 0 ]]; then
+        BUILDOPT+="v"
+    fi
+    msg "running ./build.sh -$BUILDOPT -t $TAG"
+    ./build.sh -$BUILDOPT -t $TAG
+
+    OUT_FOLDER="/home/$PROJECT_AUTHOR/$PROJECT_BUILDNAME/local"
+    mkdir -p $OUT_FOLDER
+    ./generateComposeFolder.sh -L -o "$OUT_FOLDER" -t $TAG
+    
+    cd "$OUT_FOLDER"
+    docker-compose up -d
+fi
diff --git a/scripts/generateComposeFolder.sh b/scripts/generateComposeFolder.sh
new file mode 100755
index 0000000..62b2403
--- /dev/null
+++ b/scripts/generateComposeFolder.sh
@@ -0,0 +1,93 @@
+#!/bin/bash
+######
+# Generates dockerfiles
+# It expects docker to be logged in to ECR (see aws-login)
+
+set -e
+
+VERBOSE=0
+
+DIR=`dirname $(realpath "${BASH_SOURCE[0]}")`
+OLDDIR=`pwd`
+cd "$DIR"
+
+source "$DIR/../config"
+source "$DIR/libs.sh"
+
+usage() {
+    echo "Usage: $0 [-h] [-v] [-dub] [-i: input, default] -o: output " 1>&2; 
+    echo "This script builds framework docker images, the following options are available:" 1>&2; 
+    echo "  -h: This message" 1>&2; 
+    echo "  Environment" 1>&2; 
+    echo "     -l: Local" 1>&2; 
+    echo "     -L: Local Live" 1>&2; 
+    echo "     -s: Test" 1>&2; 
+    echo "     -p: Production" 1>&2; 
+    echo "  -i: Config Input File" 1>&2;
+    echo "  -o: Output directory" 1>&2;
+    echo "  -t: Project version, this will be used as base for the docker image tag (default: local)" 1>&2; 
+    echo "  -v: Verbose" 1>&2; 
+    exit 1;
+}
+
+STARTING_FILE=""
+CFGFILE="$DIR/../config"
+OUT_DIRECTORY=""
+
+SELECTED_MODES=0
+
+while getopts "i:o:t:hvlLsp" o; do
+    case "${o}" in
+        l)
+            STARTING_FILE="$DIR/../cicd/docker-compose/local.yml"
+            SELECTED_MODES+=1
+            ;;
+        L)
+            STARTING_FILE="$DIR/../cicd/docker-compose/local-live.yml"
+            SELECTED_MODES+=1
+            ;;
+        s)
+            STARTING_FILE="$DIR/../cicd/docker-compose/test.yml"
+            SELECTED_MODES+=1
+            ;;
+        p)
+            STARTING_FILE="$DIR/../cicd/docker-compose/production.yml"
+            SELECTED_MODES+=1
+            ;;
+        i)
+            CFGFILE="${OLDDIR}/${OPTARG}"
+            ;;
+        o)
+            OUT_DIRECTORY="${OPTARG}"
+            ;;
+        t)
+            TAG=${OPTARG}
+            ;;
+        v)
+            VERBOSE=1
+            ;;
+        h) 
+            usage
+            ;;
+		*)
+            printerr "Unsupported option ${o}"
+			usage
+			;;
+    esac
+done
+
+
+if [[ $SELECTED_MODES -ne 1 ]]; then 
+    printerr "Invalid mode"
+    usage
+fi
+
+if [[ $OUT_DIRECTORY == "" ]]; then
+    printerr "An output directory must be configured"
+    usage
+fi
+
+cp -r "$DIR/../cicd/environments" "$OUT_DIRECTORY/environments"
+
+buildTemplate -f "$CFGFILE" -t "$STARTING_FILE" -o "$OUT_DIRECTORY/docker-compose.yml" --add TAG_NAME=$TAG
+
diff --git a/scripts/generateDockerfile.sh b/scripts/generateDockerfile.sh
new file mode 100755
index 0000000..f1b20bc
--- /dev/null
+++ b/scripts/generateDockerfile.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+######
+# Generates dockerfiles
+# It expects docker to be logged in to ECR (see aws-login)
+
+set -e
+
+VERBOSE=0
+
+DIR=`dirname $(realpath "${BASH_SOURCE[0]}")`
+OLDDIR=`pwd`
+cd "$DIR"
+
+source "$DIR/../config"
+source "$DIR/libs.sh"
+
+usage() {
+    echo "Usage: $0 [-h] [-v] [-dub] [-i: input, default] -o: output " 1>&2; 
+    echo "This script builds framework docker images, the following options are available:" 1>&2; 
+    echo "  -h: This message" 1>&2; 
+    echo "  Environment" 1>&2; 
+    echo "     -d: Debug" 1>&2; 
+    echo "     -u: Unit" 1>&2; 
+    echo "     -b: Base" 1>&2; 
+    echo "  -i: Config Input File" 1>&2; 
+    echo "  -o: Output file" 1>&2; 
+    echo "  -v: Verbose" 1>&2; 
+    exit 1;
+}
+
+OUTFILE=""
+CFGFILE="../config"
+
+SELECTED_MODES=0
+DEBUG_MODE=0
+UNIT_MODE=0
+BASE_MODE=0
+
+while getopts "i:o:hvdub" o; do
+    case "${o}" in
+        d)
+            DEBUG_MODE=1
+            SELECTED_MODES+=1
+            ;;
+        u)
+            UNIT_MODE=1
+            SELECTED_MODES+=1
+            ;;
+        b)
+            BASE_MODE=1
+            SELECTED_MODES+=1
+            ;;
+        i)
+            if [[  "$OPTARG" != "${OPTARG#/}" ]]; then
+                CFGFILE="${OPTARG}"
+            else 
+                CFGFILE="${OLDDIR}/${OPTARG}"
+            fi
+            ;;
+        o)
+            if [[  "$OPTARG" != "${OPTARG#/}" ]]; then
+                OUTFILE="${OPTARG}"
+            else 
+                OUTFILE="${OLDDIR}/${OPTARG}"
+            fi
+            ;;
+        v) 
+            VERBOSE=1
+            ;;
+        h) 
+            usage
+            ;;
+		*)
+            printerr "Unsupported option ${o}"
+			usage
+			;;
+    esac
+done
+
+
+if [[ $SELECTED_MODES -ne 1 ]]; then 
+    printerr "Invalid mode"
+    usage
+fi
+
+if [[ $OUTFILE == "" ]]; then 
+    printerr "Missing outfile"
+    usage
+fi
+
+STARTING_FILE="../cicd/dockerfiles/build.dockerfile"
+if [[ $DEBUG_MODE -eq 1 ]]; then
+    STARTING_FILE="../cicd/dockerfiles/debug.dockerfile"
+fi
+if [[ $UNIT_MODE -eq 1 ]]; then
+    STARTING_FILE="../cicd/dockerfiles/test.dockerfile"
+fi
+msg "Using source file $STARTING_FILE"
+
+buildTemplate -f "$CFGFILE" -t "$STARTING_FILE" -o "$OUTFILE"
+
diff --git a/scripts/libs.sh b/scripts/libs.sh
new file mode 100644
index 0000000..aa5d858
--- /dev/null
+++ b/scripts/libs.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+# Shared utility methods
+
+function printerr() {
+    echo -e "\e[31m[ERROR]\e[0m $1"
+}
+
+function msg() {
+    if [[ $VERBOSE -gt 0 ]]; then
+        echo "$1"
+    fi
+}
+
+
+function buildTemplate() {
+    local CONFIG_FILE=""
+    local SEPARATOR="§"
+    declare -A ADDITIONALS
+
+    while [[ "$#" -gt 0 ]]
+    do
+        case $1 in
+        -f|--input-file)
+            CONFIG_FILE="$2"
+            ;;
+        -t|--template)
+            local SOURCE_FILE="$2"
+            ;;
+        -o|--output)
+            local OUTPUT_FILE="$2"
+            ;;
+        -s|--separator)
+            SEPARATOR="$2"
+            ;;
+        --add)
+            arrIN=(${2//=/ })
+            ADDITIONALS[${arrIN[0]}]=${arrIN[1]}
+            ;;
+        esac
+        shift
+    done
+
+    if [[ -z $CONFIG_FILE ]]; then
+        printerr "Impossible to call ${FUNCNAME} without passing a config file file"
+        exit 1
+    else 
+        source "$CONFIG_FILE"
+    fi
+    if [[ -z $OUTPUT_FILE ]]; then
+        printerr "Impossible to call ${FUNCNAME} without passing an output file"
+        exit 1
+    fi
+    if [[ -z $SOURCE_FILE ]]; then
+        printerr "Impossible to call ${FUNCNAME} without passing a template file"
+        exit 1
+    fi
+
+    TMPFILE=`mktemp`
+
+    cp "$SOURCE_FILE" "$OUTPUT_FILE"
+
+    for config_key in "${!CONFIG[@]}"; do
+        cp "$OUTPUT_FILE" "$TMPFILE"
+        config_value="${CONFIG[$config_key]}"
+        cat "$TMPFILE" | sed -e "s~${SEPARATOR}${config_key}${SEPARATOR}~${config_value}~g" > "$OUTPUT_FILE"
+    done
+
+    for config_key in "${!ADDITIONALS[@]}"; do
+        cp "$OUTPUT_FILE" "$TMPFILE"
+        config_value="${ADDITIONALS[$config_key]}"
+        cat "$TMPFILE" | sed -e "s~${SEPARATOR}${config_key}${SEPARATOR}~${config_value}~g" > "$OUTPUT_FILE"
+    done
+
+}
\ No newline at end of file
diff --git a/scripts/publish.sh b/scripts/publish.sh
new file mode 100755
index 0000000..5f7b909
--- /dev/null
+++ b/scripts/publish.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+######
+# This script is used to publish images to ECR.
+# It exepcts images to be already built on the local docker
+# It expects docker to be logged in to ECR (see aws-login)
+
+set -e
+
+VERBOSE=0
+
+DIR=`dirname $(realpath "${BASH_SOURCE[0]}")`
+OLDDIR=`pwd`
+cd "$DIR"
+
+source "$DIR/../config"
+source "$DIR/libs.sh"
+
+usage() {
+    echo "Usage: $0 [-h] [-v] [-t: version]" 1>&2; 
+    echo "This script pushes framework docker images, the following options are available:" 1>&2; 
+    echo "  -h: This message" 1>&2; 
+    echo "  -t: Framework version, this will be used as base for the docker image tag (default: local)" 1>&2; 
+    echo "  -v: Verbose" 1>&2; 
+    exit 1;
+}
+
+TAG=""
+
+while getopts "t:hv" o; do
+    case "${o}" in
+        t)
+            TAG=${OPTARG}
+            ;;
+        v) 
+            VERBOSE=1
+            ;;
+        h) 
+            usage
+            ;;
+		*)
+            printerr "Unsupported option ${o}"
+			usage
+			;;
+    esac
+done
+
+if [[ $TAG == "" ]]; then
+    printerr "Tag (-t) is required"
+fi
+
+msg "Pushing project version $TAG"
+docker push $PROJECT_REPOSITORY/$PROJECT_GROUP/$PROJECT_BUILDNAME:$TAG
diff --git a/scripts/run-unit.sh b/scripts/run-unit.sh
new file mode 100755
index 0000000..d5507c4
--- /dev/null
+++ b/scripts/run-unit.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+######
+# This script runs unit tests and fails if unit tests don't succeed
+# It expects docker to be logged in to ECR (see aws-login)
+
+set -e
+
+VERBOSE=0
+
+DIR=`dirname $(realpath "${BASH_SOURCE[0]}")`
+OLDDIR=`pwd`
+cd "$DIR"
+
+source "$DIR/../config"
+source "$DIR/libs.sh"
+
+usage() {
+    echo "Usage: $0 [-h] [-v] [-t: version] [image type, see below] " 1>&2; 
+    echo "This script runs unit test for docker images, the image must exist:" 1>&2; 
+    echo "  -h: This message" 1>&2; 
+    echo "  -t: Framework version, this will be used as base for the docker image tag (default: local)" 1>&2; 
+    echo "  -v: Verbose" 1>&2; 
+    exit 1;
+}
+
+TAG="local"
+
+while getopts "t:hvaAjJmub" o; do
+    case "${o}" in
+        t)
+            TAG=${OPTARG}
+            ;;
+        v) 
+            VERBOSE=1
+            ;;
+        h) 
+            usage
+            ;;
+		*)
+            printerr "Unsupported option ${o}"
+			usage
+			;;
+    esac
+done
+
+msg "Checking unit tests for version $TAG"
+docker run $PROJECT_REPOSITORY/$PROJECT_GROUP/$PROJECT_BUILDNAME:$TAG-unit -c /test-phpframework/phpunit.xml
diff --git a/test/core/TestFake.php b/test/core/TestFake.php
new file mode 100644
index 0000000..dcdde2a
--- /dev/null
+++ b/test/core/TestFake.php
@@ -0,0 +1,20 @@
+<?php
+/******************************************
+*  Author : Riccardo Di Dato   
+*  Created On : Fri May 10 2019
+*  File : TestFake.php
+*******************************************/
+
+namespace ASD {
+	use \PHPUnit\Framework\TestCase;
+
+	class TestFake extends TestCase {
+
+		public function testAdd() {
+			$this->assertEquals(true,true);
+		}
+	}
+}
+
+
+?>
\ No newline at end of file
diff --git a/test/install b/test/install
new file mode 100644
index 0000000..98f7ff5
--- /dev/null
+++ b/test/install
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+source ./config
+
+# Create paths
+mkdir -p /home/$PROJECT_AUTHOR/private/$PROJECT_BUILDNAME
+mkdir -p /var/log/$PROJECT_AUTHOR/$PROJECT_BUILDNAME
+
+# Copy stuff
+cp -r ./private/* /home/$PROJECT_AUTHOR/private/$PROJECT_BUILDNAME/
\ No newline at end of file
diff --git a/test/phpunit.xml b/test/phpunit.xml
new file mode 100644
index 0000000..7eb4333
--- /dev/null
+++ b/test/phpunit.xml
@@ -0,0 +1,22 @@
+<phpunit bootstrap="test.inclusions.php">
+	<testsuites>
+		<testsuite name="core">
+			<file>core/TestFake.php</file>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<!-- <whitelist processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">/home/ddninja/private/mailqueue/lib/</directory>
+			<exclude>
+				<directory suffix="lib.inclusion.php">/home/ddninja/private/mailqueue/lib/</directory>
+				<directory suffix="lib.config.php">/home/ddninja/private/mailqueue/lib/</directory>
+				<directory >/home/ddninja/private/mailqueue/lib/email/</directory>
+				<file >/home/ddninja/private/mailqueue/lib/lib.inclusions.php</file>
+				<file >/home/ddninja/private/mailqueue/lib/lib.configs.php</file>
+			</exclude>
+		</whitelist> -->
+	</filter>
+	<logging>
+  		<log type="coverage-html" target="/tmp/htmlreport/report.html" lowUpperBound="35" highLowerBound="70"/>
+	</logging>
+</phpunit>
diff --git a/test/test.inclusions.php b/test/test.inclusions.php
new file mode 100644
index 0000000..833a650
--- /dev/null
+++ b/test/test.inclusions.php
@@ -0,0 +1,10 @@
+<?php 
+
+require_once("/test-phpframework/test.inclusions.php");
+
+$buildName = getenv("DDNINJA_BUILDNAME");
+require_once("/home/ddninja/private/$buildName/lib/lib.inclusions.php");
+
+require_once(dirname(__FILE__)."/utility/lib.inclusions.php");
+
+?>
\ No newline at end of file
diff --git a/test/utility/lib.inclusions.php b/test/utility/lib.inclusions.php
new file mode 100644
index 0000000..f835601
--- /dev/null
+++ b/test/utility/lib.inclusions.php
@@ -0,0 +1,8 @@
+<?php
+/*
+ * lib.inclusions.php
+ * Author:              Riccardo Di Dato
+ * Creation Date:       09 apr 2019
+ */
+
+?>
\ No newline at end of file
diff --git a/version b/version
new file mode 100644
index 0000000..c2c027f
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+local
\ No newline at end of file