diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19d5eeb..c25ae0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,19 +2,19 @@
 
 ## r5 (2017/06/07)
 
-* Drush 8.1.11 r4 malformed (Issue crazy-max/neard#272)
+* Drush 8.1.11 r4 malformed (Issue neard/neard#272)
 
 ## r4 (2017/05/23)
 
-* New bundle : 8.1.11 (Issue crazy-max/neard#260)
+* New bundle : 8.1.11 (Issue neard/neard#260)
 
 ## r3 (2016/10/11)
 
-* New bundles : 7.4.0, 8.1.5 (Issue crazy-max/neard#121)
+* New bundles : 7.4.0, 8.1.5 (Issue neard/neard#121)
 
 ## r2 (2016/05/12)
 
-* Add bundle : 8.1.2 (Issue crazy-max/neard#121)
+* Add bundle : 8.1.2 (Issue neard/neard#121)
 
 ## r1 (2016/04/30)
 
diff --git a/README.md b/README.md
index 7d450cf..441a52e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-[![GitHub release](https://img.shields.io/github/release/crazy-max/neard-tool-drush.svg?style=flat-square)](https://github.com/crazy-max/neard-tool-drush/releases/latest)
-![Total downloads](https://img.shields.io/github/downloads/crazy-max/neard-tool-drush/total.svg?style=flat-square)
+[![GitHub release](https://img.shields.io/github/release/neard/module-drush.svg?style=flat-square)](https://github.com/neard/module-drush/releases/latest)
+![Total downloads](https://img.shields.io/github/downloads/neard/module-drush/total.svg?style=flat-square)
 
-This is a module of [Neard project](https://github.com/crazy-max/neard) involving Drush.
+This is a module of [Neard project](https://github.com/neard/neard) involving Drush.
 
 ## Documentation and downloads
 
@@ -9,4 +9,4 @@ http://neard.io/modules/drush
 
 ## Issues
 
-Issues must be reported on [Neard repository](https://github.com/crazy-max/neard/issues).
+Issues must be reported on [Neard repository](https://github.com/neard/neard/issues).
diff --git a/bin/drush5.9.0/bins.properties b/bin/drush5.9.0/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush5.9.0/bins.properties
+++ b/bin/drush5.9.0/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/bin/drush6.7.0/bins.properties b/bin/drush6.7.0/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush6.7.0/bins.properties
+++ b/bin/drush6.7.0/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/bin/drush7.3.0/bins.properties b/bin/drush7.3.0/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush7.3.0/bins.properties
+++ b/bin/drush7.3.0/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/bin/drush7.4.0/bins.properties b/bin/drush7.4.0/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush7.4.0/bins.properties
+++ b/bin/drush7.4.0/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/bin/drush8.1.0/bins.properties b/bin/drush8.1.0/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush8.1.0/bins.properties
+++ b/bin/drush8.1.0/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/bin/drush8.1.11/bins.properties b/bin/drush8.1.11/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush8.1.11/bins.properties
+++ b/bin/drush8.1.11/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/bin/drush8.1.2/bins.properties b/bin/drush8.1.2/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush8.1.2/bins.properties
+++ b/bin/drush8.1.2/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/bin/drush8.1.5/bins.properties b/bin/drush8.1.5/bins.properties
index 6216e70..e816966 100644
--- a/bin/drush8.1.5/bins.properties
+++ b/bin/drush8.1.5/bins.properties
@@ -1,7 +1,7 @@
-bzip2 = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
-gzip = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
-libarchive = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
-tar = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
-wget = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
-wget-dep = https://github.com/crazy-max/neard-modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
-mysql = https://github.com/crazy-max/neard-modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
+bzip2 = https://github.com/neard/modules-untouched/releases/download/drush-r1/bzip2-1.0.5-bin.zip
+gzip = https://github.com/neard/modules-untouched/releases/download/drush-r1/gzip-1.3.12-1-bin.zip
+libarchive = https://github.com/neard/modules-untouched/releases/download/drush-r1/libarchive-2.4.12-1-bin.zip
+tar = https://github.com/neard/modules-untouched/releases/download/drush-r1/tar-1.13-1-bin.zip
+wget = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-bin.zip
+wget-dep = https://github.com/neard/modules-untouched/releases/download/drush-r1/wget-1.11.4-1-dep.zip
+mysql = https://github.com/neard/modules-untouched/releases/download/mysql-r1/mysql-5.6.34-win32.zip
diff --git a/build.xml b/build.xml
index 4e81789..ac77ba1 100644
--- a/build.xml
+++ b/build.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="neard-tool-drush" basedir=".">
+<project name="module-drush" basedir=".">
   
-  <dirname property="project.basedir" file="${ant.file.neard-tool-drush}"/>
+  <dirname property="project.basedir" file="${ant.file.module-drush}"/>
   <property name="root.dir" location="${project.basedir}/.."/>
   <property name="build.properties" value="${project.basedir}/build.properties"/>
   <property file="${build.properties}"/>
   
   <!-- Neard dev -->
-  <property name="neard-dev.path" location="${root.dir}/neard-dev"/>
-  <fail unless="neard-dev.path" message="Project 'neard-dev' not found in ${neard-dev.path}"/>
-  <echo message="Neard dev found in ${neard-dev.path}" level="debug"/> 
+  <property name="dev.path" location="${root.dir}/dev"/>
+  <fail unless="dev.path" message="Project 'dev' not found in ${dev.path}"/>
+  <echo message="Neard dev found in ${dev.path}" level="debug"/> 
   
   <!-- Import build-commons.xml -->
-  <import file="${neard-dev.path}/build/build-commons.xml"/>
+  <import file="${dev.path}/build/build-commons.xml"/>
   <!-- Import build-bundle.xml -->
-  <import file="${neard-dev.path}/build/build-bundle.xml"/>
+  <import file="${dev.path}/build/build-bundle.xml"/>
   
   <target name="release.build">
     <basename property="bundle.folder" file="${bundle.path}"/>
diff --git a/releases.properties b/releases.properties
index 7cd2aa8..8227df5 100644
--- a/releases.properties
+++ b/releases.properties
@@ -1,8 +1,8 @@
-5.9.0 = https://github.com/crazy-max/neard-tool-drush/releases/download/r1/neard-drush-5.9.0-r1.7z
-6.7.0 = https://github.com/crazy-max/neard-tool-drush/releases/download/r1/neard-drush-6.7.0-r1.7z
-7.3.0 = https://github.com/crazy-max/neard-tool-drush/releases/download/r1/neard-drush-7.3.0-r1.7z
-7.4.0 = https://github.com/crazy-max/neard-tool-drush/releases/download/r3/neard-drush-7.4.0-r3.7z
-8.1.0 = https://github.com/crazy-max/neard-tool-drush/releases/download/r1/neard-drush-8.1.0-r1.7z
-8.1.2 = https://github.com/crazy-max/neard-tool-drush/releases/download/r2/neard-drush-8.1.2-r2.7z
-8.1.5 = https://github.com/crazy-max/neard-tool-drush/releases/download/r3/neard-drush-8.1.5-r3.7z
-8.1.11 = https://github.com/crazy-max/neard-tool-drush/releases/download/r5/neard-drush-8.1.11-r5.7z
+5.9.0 = https://github.com/neard/module-drush/releases/download/r1/neard-drush-5.9.0-r1.7z
+6.7.0 = https://github.com/neard/module-drush/releases/download/r1/neard-drush-6.7.0-r1.7z
+7.3.0 = https://github.com/neard/module-drush/releases/download/r1/neard-drush-7.3.0-r1.7z
+7.4.0 = https://github.com/neard/module-drush/releases/download/r3/neard-drush-7.4.0-r3.7z
+8.1.0 = https://github.com/neard/module-drush/releases/download/r1/neard-drush-8.1.0-r1.7z
+8.1.2 = https://github.com/neard/module-drush/releases/download/r2/neard-drush-8.1.2-r2.7z
+8.1.5 = https://github.com/neard/module-drush/releases/download/r3/neard-drush-8.1.5-r3.7z
+8.1.11 = https://github.com/neard/module-drush/releases/download/r5/neard-drush-8.1.11-r5.7z