diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000000..9bad745bc1
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,58 @@
+{
+    "name": "humhub/humhub",
+    "description": "TBD",
+    "keywords": ["humhub", "yii2", "framework"],
+    "homepage": "http://www.humhub.com/",
+    "type": "project",
+    "license": "AGPL-3.0",
+    "support": {
+        "issues": "https://github.com/humhub/humhub/issues?state=open",
+        "forum": "http://community.humhub.com",
+        "wiki": "http://community.humhub.com",
+        "irc": "irc://irc.freenode.net/humhub",
+        "source": "https://github.com/humhub/humhub"
+    },
+    "minimum-stability": "stable",
+    "require": {
+        "php": ">=5.4.0",
+        "yiisoft/yii2": ">=2.0.4",
+        "yiisoft/yii2-bootstrap": "*",
+        "yiisoft/yii2-swiftmailer": "*",
+        "raoul2000/yii2-jcrop-widget": "*",
+        "yiisoft/yii2-jui": "^2.0"
+    },
+    "require-dev": {
+        "yiisoft/yii2-codeception": "*",
+        "yiisoft/yii2-debug": "*",
+        "yiisoft/yii2-gii": "*",
+        "yiisoft/yii2-faker": "*"
+    },
+    "config": {
+        "process-timeout": 1800,
+        "vendor-dir": "protected/vendor"
+    },
+    "scripts": {
+        "post-create-project-cmd": [
+            "yii\\composer\\Installer::postCreateProject"
+        ]
+    },
+    "extra": {
+        "yii\\composer\\Installer::postCreateProject": {
+            "setPermission": [
+                {
+                    "protected/runtime": "0777",
+                    "assets": "0777",
+                    "protected/yii": "0755",
+                    "protected/modules": "0755"
+                }
+            ],
+            "generateCookieValidationKey": [
+                "protected/config/web.php"
+            ]
+        },
+        "asset-installer-paths": {
+            "npm-asset-library": "protected/vendor/npm",
+            "bower-asset-library": "protected/vendor/bower"
+        }
+    }
+}
diff --git a/index.php b/index.php
index 261d139c57..49fcc85ac5 100644
--- a/index.php
+++ b/index.php
@@ -1,41 +1,20 @@
 <?php
 
 /**
- * HumHub
- * Copyright © 2014 The HumHub Project
- *
- * The texts of the GNU Affero General Public License with an additional
- * permission and of our proprietary license can be found at and
- * in the LICENSE file you have received along with this program.
- *
- * According to our dual licensing model, this program can be used either
- * under the terms of the GNU Affero General Public License, version 3,
- * or under a proprietary license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) 2015 HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
  */
-$yii = dirname(__FILE__) . '/protected/vendors/yii/yii.php';
-$config = dirname(__FILE__) . '/protected/config/main.php';
-$appClass = dirname(__FILE__) . '/protected/components/WebApplication.php';
-
-// Disable these 3 lines when in production mode
+// comment out the following two lines when deployed to production
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_TRACE_LEVEL') or define('YII_TRACE_LEVEL', 5);
-ini_set('error_reporting', E_ALL);
+defined('YII_ENV') or define('YII_ENV', 'dev');
 
-require_once($yii);
-require_once($appClass);
+require(__DIR__ . '/protected/vendor/autoload.php');
+require(__DIR__ . '/protected/vendor/yiisoft/yii2/Yii.php');
+$config = require(__DIR__ . '/protected/config/web.php');
 
-$app = Yii::createApplication('WebApplication', $config);
+Yii::setAlias('@webroot', __DIR__);
+Yii::setAlias('@app', __DIR__ . DIRECTORY_SEPARATOR . 'protected');
+Yii::setAlias('@humhub', '@app/humhub');
 
-Yii::setPathOfAlias('Zend',Yii::getPathOfAlias('application.vendors.Zend2'));
-        
-Yii::import('application.vendors.*');
-EZendAutoloader::$prefixes = array('Zend', 'Custom');
-Yii::import("ext.yiiext.components.zendAutoloader.EZendAutoloader", true);
-Yii::registerAutoloader(array("EZendAutoloader", "loadClass"), true);
-
-$app->run();
+(new yii\web\Application($config))->run();
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000000..6f27bb66a3
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
\ No newline at end of file