diff --git a/README.md b/README.md
index 80bc72443a..b7cba1d491 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-**survey.js.editor** is the visual editor for [surveyjs](https://github.com/andrewtelnov/surveyjs). It uses JSON to store the survey metadata.
+**survey.js.editor** is the visual editor for [surveyjs](https://github.com/surveyjs/surveyjs). It uses JSON to store the survey metadata.
 
-[![Build Status](https://travis-ci.org/andrewtelnov/surveyjs.editor.svg?branch=master)](https://travis-ci.org/andrewtelnov/surveyjs.editor)
+[![Build Status](https://travis-ci.org/surveyjs/editor.svg?branch=master)](https://travis-ci.org/surveyjs/editor)
 
 #Download
 Dowload the latest version as zip file [Download](http://surveyjs.org/downloads/surveyjs.editor.zip)
@@ -20,7 +20,7 @@ To build library yourself:
 
  1. **Clone the repo from GitHub**  
 	```
-	git clone https://github.com/andrewtelnov/surveyjs.editor.git
+	git clone https://github.com/surveyjs/editor.git
 	cd surveyjs.editor
 	```
 
@@ -53,15 +53,9 @@ To build library yourself:
 	The first command will copy all required files to 'wwwroot' directory and the last command will run unit tests usign [Karma](https://karma-runner.github.io/0.13/index.html)
 
 
-##Coming features
-
-Find the features under development and Todo list in the [Trello board](https://trello.com/b/lAwhTw3H/surveyjs-project).
-
 #Dependencies
  The library depends on: [surveyjs](http://surveyjs.org), [knockoutjs](http://knockoutjs.com), [bootstrap](http://getbootstrap.com) and [ace editor](https://ace.c9.io/).
 
 #License
 
-|Non-commercial use   | Commercial use   |
-|------|------|
-|[![Noncommercial](https://licensebuttons.net/l/by-nc/3.0/88x31.png)](http://creativecommons.org/licenses/by-nc/3.0/legalcode) | Please contact me: andrew.telnov at gmail.com  |
\ No newline at end of file
+The SurveyJS Editor is NOT FREE for commercial using. Please find more about licensing the product [here](http://editor.surveyjs.io/license.html).
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index bd1412c532..898adb86cc 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -50,8 +50,9 @@ paths.concatCssDest = paths.webroot + "css/site.min.css";
 
 var copyright = ["/*!",
  "* surveyjs Editor v" + editorVersion,
- "* (c) Andrew Telnov - http://surveyjs.org/builder/",
- "* Github - https://github.com/andrewtelnov/survey.js.editor",
+ "* (c) Devsoft Baltic OÜ - http://surveyjs.io/",
+ "* Github - https://github.com/surveyjs/editor",
+ "* License: (http://editor.surveyjs.io/license.html)",
  "*/", "", ""].join("\n");
 
 var webpack_params = {
diff --git a/packagetemplate.json b/packagetemplate.json
index 344842ace7..03d01d9361 100644
--- a/packagetemplate.json
+++ b/packagetemplate.json
@@ -8,7 +8,7 @@
     "Editor",
     "surveyjs"
   ],
-  "homepage": "https://surveyjs.org/builder/",
+  "homepage": "http://editor.surveyjs.io",
   "files": [
     "dist/",
     "js/"
@@ -16,7 +16,7 @@
   "main": "./js/surveyeditor.min.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/andrewtelnov/surveyjs.editor.git"
+    "url": "https://github.com/surveyjs/surveyjs.git"
   },
   "engines": {
     "node": ">=0.10.0"
diff --git a/tests/ObjectEditorTests.ts b/tests/ObjectEditorTests.ts
index 975b2a02fa..21c5c6180b 100644
--- a/tests/ObjectEditorTests.ts
+++ b/tests/ObjectEditorTests.ts
@@ -65,7 +65,7 @@ QUnit.test("Use metadata getPropertyValue function", function (assert) {
     editor.koActiveProperty().koValue("newName");
     assert.equal(property.koText(), "test", "use the real value to get value");
 });
-QUnit.test("Fix the bug with title property, https://github.com/andrewtelnov/surveyjs.editor/issues/33", function (assert) {
+QUnit.test("Fix the bug with title property, https://github.com/surveyjs/editor/issues/33", function (assert) {
     var editor = new SurveyObjectEditor();
     var car = new BigCar();
     car.name = "name1";