diff --git a/HISTORY.rst b/HISTORY.rst
index 5c88bb68..a9946b0e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -5,7 +5,7 @@ Release History
 ------------------
 
 * Improved handling of multi-file ``*.ino/pde`` sketches
-  (`issue #130 <https://github.com/ivankravets/platformio/issues/130>`_)
+  (`issue #130 <https://github.com/platformio/platformio/issues/130>`_)
 
 
 1.2.0 (2015-03-20)
@@ -27,10 +27,10 @@ Release History
   development platform
 * Created new `Frameworks <http://docs.platformio.org/en/latest/frameworks/index.html>`__
   page in documentation and added to `PlatformIO Web Site <http://platformio.org>`_
-  (`issue #115 <https://github.com/ivankravets/platformio/issues/115>`_)
+  (`issue #115 <https://github.com/platformio/platformio/issues/115>`_)
 * Introduced online `Embedded Boards Explorer <http://platformio.org/#!/boards>`_
 * Automatically append define ``-DPLATFORMIO=%version%`` to
-  builder (`issue #105 <https://github.com/ivankravets/platformio/issues/105>`_)
+  builder (`issue #105 <https://github.com/platformio/platformio/issues/105>`_)
 * Renamed ``stm32`` development platform to
   `ststm32 <http://docs.platformio.org/en/latest/platforms/ststm32.html>`__
 * Renamed ``opencm3`` framework to
@@ -38,13 +38,13 @@ Release History
 * Fixed uploading for `atmelsam <http://docs.platformio.org/en/latest/platforms/atmelsam.html>`__
   development platform
 * Fixed re-arranging the ``*.ino/pde`` files when converting to ``*.cpp``
-  (`issue #100 <https://github.com/ivankravets/platformio/issues/100>`_)
+  (`issue #100 <https://github.com/platformio/platformio/issues/100>`_)
 
 1.1.0 (2015-03-05)
 ------------------
 
 * Implemented ``PLATFORMIO_*`` environment variables
-  (`issue #102 <https://github.com/ivankravets/platformio/issues/102>`_)
+  (`issue #102 <https://github.com/platformio/platformio/issues/102>`_)
 * Added support for *SainSmart* boards to
   `atmelsam <http://docs.platformio.org/en/latest/platforms/atmelsam.html#boards>`__
   development platform
@@ -52,11 +52,11 @@ Release History
   `Project Configuration <http://docs.platformio.org/en/latest/projectconf.html>`__
   option named `envs_dir <http://docs.platformio.org/en/latest/projectconf.html#envs-dir>`__
 * Disabled "prompts" automatically for *Continuous Integration* systems
-  (`issue #103 <https://github.com/ivankravets/platformio/issues/103>`_)
+  (`issue #103 <https://github.com/platformio/platformio/issues/103>`_)
 * Fixed firmware uploading for
   `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html#boards>`__
   boards which work within ``usbtiny`` protocol
-* Fixed uploading for *Digispark* board (`issue #106 <https://github.com/ivankravets/platformio/issues/106>`_)
+* Fixed uploading for *Digispark* board (`issue #106 <https://github.com/platformio/platformio/issues/106>`_)
 
 1.0.1 (2015-02-27)
 ------------------
@@ -69,14 +69,14 @@ Release History
   `BeagleBone <http://beagleboard.org>`_ and `CubieBoard <http://cubieboard.org>`_
 * Added `atmelsam <http://docs.platformio.org/en/latest/platforms/atmelsam.html>`__
   development platform with supported boards: *Arduino Due and Digistump DigiX*
-  (`issue #71 <https://github.com/ivankravets/platformio/issues/71>`_)
+  (`issue #71 <https://github.com/platformio/platformio/issues/71>`_)
 * Added `ststm32 <http://docs.platformio.org/en/latest/platforms/ststm32.html>`__
   development platform with supported boards: *Discovery kit for STM32L151/152,
   STM32F303xx, STM32F407/417 lines* and `libOpenCM3 Framework <http://www.libopencm3.org>`_
-  (`issue #73 <https://github.com/ivankravets/platformio/issues/73>`_)
+  (`issue #73 <https://github.com/platformio/platformio/issues/73>`_)
 * Added `teensy <http://docs.platformio.org/en/latest/platforms/teensy.html>`_
   development platform with supported boards: *Teensy 2.x & 3.x*
-  (`issue #72 <https://github.com/ivankravets/platformio/issues/72>`_)
+  (`issue #72 <https://github.com/platformio/platformio/issues/72>`_)
 * Added new *Arduino* boards to
   `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html#boards>`__
   platform: *Arduino NG, Arduino BT, Arduino Esplora, Arduino Ethernet,
@@ -84,46 +84,46 @@ Release History
 * Added support for *Adafruit* boards to
   `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html#boards>`__
   platform: *Adafruit Flora and Adafruit Trinkets*
-  (`issue #65 <https://github.com/ivankravets/platformio/issues/65>`_)
+  (`issue #65 <https://github.com/platformio/platformio/issues/65>`_)
 * Added support for *Digispark* boards to
   `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html#boards>`__
   platform: *Digispark USB Development Board and Digispark Pro*
-  (`issue #47 <https://github.com/ivankravets/platformio/issues/47>`_)
-* Covered code with tests (`issue #2 <https://github.com/ivankravets/platformio/issues/2>`_)
+  (`issue #47 <https://github.com/platformio/platformio/issues/47>`_)
+* Covered code with tests (`issue #2 <https://github.com/platformio/platformio/issues/2>`_)
 * Refactored *Library Dependency Finder* (issues
-  `#48 <https://github.com/ivankravets/platformio/issues/48>`_,
-  `#50 <https://github.com/ivankravets/platformio/issues/50>`_,
-  `#55 <https://github.com/ivankravets/platformio/pull/55>`_)
+  `#48 <https://github.com/platformio/platformio/issues/48>`_,
+  `#50 <https://github.com/platformio/platformio/issues/50>`_,
+  `#55 <https://github.com/platformio/platformio/pull/55>`_)
 * Added `src_dir <http://docs.platformio.org/en/latest/projectconf.html#src-dir>`__
   option to ``[platformio]`` section of
   `platformio.ini <http://docs.platformio.org/en/latest/projectconf.html>`__
   which allows to redefine location to project's source directory
-  (`issue #83 <https://github.com/ivankravets/platformio/issues/83>`_)
+  (`issue #83 <https://github.com/platformio/platformio/issues/83>`_)
 * Added ``--json-output`` option to
   `platformio boards <http://docs.platformio.org/en/latest/userguide/cmd_boards.html>`__
   and `platformio search <http://docs.platformio.org/en/latest/userguide/cmd_search.html>`__
   commands which allows to return the output in `JSON <http://en.wikipedia.org/wiki/JSON>`_ format
-  (`issue #42 <https://github.com/ivankravets/platformio/issues/42>`_)
+  (`issue #42 <https://github.com/platformio/platformio/issues/42>`_)
 * Allowed to ignore some libs from *Library Dependency Finder* via
   `ignore_libs <http://docs.platformio.org/en/latest/projectconf.html#ignore-libs>`_ option
 * Improved `platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`__
   command: asynchronous output for build process, timing and detailed
   information about environment configuration
-  (`issue #74 <https://github.com/ivankravets/platformio/issues/74>`_)
+  (`issue #74 <https://github.com/platformio/platformio/issues/74>`_)
 * Output compiled size and static memory usage with
   `platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`__
-  command (`issue #59 <https://github.com/ivankravets/platformio/issues/59>`_)
+  command (`issue #59 <https://github.com/platformio/platformio/issues/59>`_)
 * Updated `framework-arduino` AVR & SAM to 1.6 stable version
 * Fixed an issue with the libraries that are git repositories
-  (`issue #49 <https://github.com/ivankravets/platformio/issues/49>`_)
+  (`issue #49 <https://github.com/platformio/platformio/issues/49>`_)
 * Fixed handling of assembly files
-  (`issue #58 <https://github.com/ivankravets/platformio/issues/58>`_)
+  (`issue #58 <https://github.com/platformio/platformio/issues/58>`_)
 * Fixed compiling error if space is in user's folder
-  (`issue #56 <https://github.com/ivankravets/platformio/issues/56>`_)
+  (`issue #56 <https://github.com/platformio/platformio/issues/56>`_)
 * Fixed `AttributeError: 'module' object has no attribute 'disable_warnings'`
   when a version of `requests` package is less then 2.4.0
 * Fixed bug with invalid process's "return code" when PlatformIO has internal
-  error (`issue #81 <https://github.com/ivankravets/platformio/issues/81>`_)
+  error (`issue #81 <https://github.com/platformio/platformio/issues/81>`_)
 * Several bug fixes, increased stability and performance improvements
 
 
@@ -131,10 +131,10 @@ Release History
 -------------------
 
 * Fixed an issue with ``--json-output``
-  (`issue #42 <https://github.com/ivankravets/platformio/issues/42>`_)
+  (`issue #42 <https://github.com/platformio/platformio/issues/42>`_)
 * Fixed an exception during
   `platformio upgrade <http://docs.platformio.org/en/latest/userguide/cmd_upgrade.html>`__
-  under Windows OS (`issue #45 <https://github.com/ivankravets/platformio/issues/45>`_)
+  under Windows OS (`issue #45 <https://github.com/platformio/platformio/issues/45>`_)
 
 0.10.1 (2015-01-02)
 -------------------
@@ -144,7 +144,7 @@ Release History
   `platformio serialports list <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html>`__ and
   `platformio lib list <http://docs.platformio.org/en/latest/userguide/lib/cmd_list.html>`__
   commands which allows to return the output in `JSON <http://en.wikipedia.org/wiki/JSON>`_ format
-  (`issue #42 <https://github.com/ivankravets/platformio/issues/42>`_)
+  (`issue #42 <https://github.com/platformio/platformio/issues/42>`_)
 * Fixed missing auto-uploading by default after `platformio init <http://docs.platformio.org/en/latest/userguide/cmd_init.html>`__
   command
 
@@ -154,31 +154,31 @@ Release History
 **Happy New Year!**
 
 * Implemented `platformio boards <http://docs.platformio.org/en/latest/userguide/cmd_boards.html>`_
-  command (`issue #11 <https://github.com/ivankravets/platformio/issues/11>`_)
+  command (`issue #11 <https://github.com/platformio/platformio/issues/11>`_)
 * Added support of *Engduino* boards for
   `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html#engduino>`__
-  platform (`issue #38 <https://github.com/ivankravets/platformio/issues/38>`_)
+  platform (`issue #38 <https://github.com/platformio/platformio/issues/38>`_)
 * Added ``--board`` option to `platformio init <http://docs.platformio.org/en/latest/userguide/cmd_init.html>`__
   command which allows to initialise project with the specified embedded boards
-  (`issue #21 <https://github.com/ivankravets/platformio/issues/21>`_)
+  (`issue #21 <https://github.com/platformio/platformio/issues/21>`_)
 * Added `example with uploading firmware <http://docs.platformio.org/en/latest/projectconf.html#examples>`_
   via USB programmer (USBasp) for
   `atmelavr <http://docs.platformio.org/en/latest/platforms/atmelavr.html>`_
-  *MCUs* (`issue #35 <https://github.com/ivankravets/platformio/issues/35>`_)
+  *MCUs* (`issue #35 <https://github.com/platformio/platformio/issues/35>`_)
 * Automatic detection of port on `platformio serialports monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_
-  (`issue #37 <https://github.com/ivankravets/platformio/issues/37>`_)
-* Allowed auto-installation of platforms when prompts are disabled (`issue #43 <https://github.com/ivankravets/platformio/issues/43>`_)
-* Fixed urllib3's *SSL* warning under Python <= 2.7.2 (`issue #39 <https://github.com/ivankravets/platformio/issues/39>`_)
-* Fixed bug with *Arduino USB* boards (`issue #40 <https://github.com/ivankravets/platformio/issues/40>`_)
+  (`issue #37 <https://github.com/platformio/platformio/issues/37>`_)
+* Allowed auto-installation of platforms when prompts are disabled (`issue #43 <https://github.com/platformio/platformio/issues/43>`_)
+* Fixed urllib3's *SSL* warning under Python <= 2.7.2 (`issue #39 <https://github.com/platformio/platformio/issues/39>`_)
+* Fixed bug with *Arduino USB* boards (`issue #40 <https://github.com/platformio/platformio/issues/40>`_)
 
 0.9.2 (2014-12-10)
 ------------------
 
-* Replaced "dark blue" by "cyan" colour for the texts (`issue #33 <https://github.com/ivankravets/platformio/issues/33>`_)
+* Replaced "dark blue" by "cyan" colour for the texts (`issue #33 <https://github.com/platformio/platformio/issues/33>`_)
 * Added new setting `enable_prompts <http://docs.platformio.org/en/latest/userguide/cmd_settings.html>`_
   and allowed to disable all *PlatformIO* prompts (useful for cloud compilers)
-  (`issue #34 <https://github.com/ivankravets/platformio/issues/34>`_)
-* Fixed compilation bug on *Windows* with installed *MSVC* (`issue #18 <https://github.com/ivankravets/platformio/issues/18>`_)
+  (`issue #34 <https://github.com/platformio/platformio/issues/34>`_)
+* Fixed compilation bug on *Windows* with installed *MSVC* (`issue #18 <https://github.com/platformio/platformio/issues/18>`_)
 
 0.9.1 (2014-12-05)
 ------------------
@@ -190,9 +190,9 @@ Release History
 * Fixed "*OSError: [Errno 2] No such file or directory*" within
   `platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`__
   command when PlatformIO isn't installed properly
-* Fixed example for `Eclipse IDE with Tiva board <https://github.com/ivankravets/platformio/tree/develop/examples/ide-eclipse>`_
-  (`issue #32 <https://github.com/ivankravets/platformio/pull/32>`_)
-* Upgraded `Eclipse Project Examples <https://github.com/ivankravets/platformio/tree/develop/examples/ide-eclipse>`_
+* Fixed example for `Eclipse IDE with Tiva board <https://github.com/platformio/platformio/tree/develop/examples/ide-eclipse>`_
+  (`issue #32 <https://github.com/platformio/platformio/pull/32>`_)
+* Upgraded `Eclipse Project Examples <https://github.com/platformio/platformio/tree/develop/examples/ide-eclipse>`_
   to latest *Luna* and *PlatformIO* releases
 
 0.9.0 (2014-12-01)
@@ -201,7 +201,7 @@ Release History
 * Implemented `platformio settings <http://docs.platformio.org/en/latest/userguide/cmd_settings.html>`_ command
 * Improved `platformio init <http://docs.platformio.org/en/latest/userguide/cmd_init.html>`_ command.
   Added new option ``--project-dir`` where you can specify another path to
-  directory where new project will be initialized (`issue #31 <https://github.com/ivankravets/platformio/issues/31>`_)
+  directory where new project will be initialized (`issue #31 <https://github.com/platformio/platformio/issues/31>`_)
 * Added *Migration Manager* which simplifies process with upgrading to a
   major release
 * Added *Telemetry Service* which should help us make *PlatformIO* better
@@ -209,9 +209,9 @@ Release History
   ``.platformio`` states.
 * Refactored *Package Manager*
 * Download Manager: fixed SHA1 verification within *Cygwin Environment*
-  (`issue #26 <https://github.com/ivankravets/platformio/issues/26>`_)
+  (`issue #26 <https://github.com/platformio/platformio/issues/26>`_)
 * Fixed bug with code builder and built-in Arduino libraries
-  (`issue #28 <https://github.com/ivankravets/platformio/issues/28>`_)
+  (`issue #28 <https://github.com/platformio/platformio/issues/28>`_)
 
 0.8.0 (2014-10-19)
 ------------------
@@ -220,7 +220,7 @@ Release History
   with the new fields: `frameworks <http://docs.platformio.org/en/latest/librarymanager/config.html#frameworks>`_,
   `platforms <http://docs.platformio.org/en/latest/librarymanager/config.html#platforms>`_
   and `dependencies <http://docs.platformio.org/en/latest/librarymanager/config.html#dependencies>`_
-  (`issue #17 <https://github.com/ivankravets/platformio/issues/17>`_)
+  (`issue #17 <https://github.com/platformio/platformio/issues/17>`_)
 * Switched logic from "Library Name" to "Library Registry ID" for all
   `platformio lib <http://docs.platformio.org/en/latest/userguide/lib/index.html>`_
   commands (install, uninstall, update and etc.)
@@ -234,8 +234,8 @@ Release History
 ------------------
 
 * Fixed bug with order for includes in conversation from INO/PDE to CPP
-* Automatic detection of port on upload (`issue #15 <https://github.com/ivankravets/platformio/issues/15>`_)
-* Fixed lib update crashing when no libs are installed (`issue #19 <https://github.com/ivankravets/platformio/issues/19>`_)
+* Automatic detection of port on upload (`issue #15 <https://github.com/platformio/platformio/issues/15>`_)
+* Fixed lib update crashing when no libs are installed (`issue #19 <https://github.com/platformio/platformio/issues/19>`_)
 
 
 0.7.0 (2014-09-24)
@@ -243,14 +243,14 @@ Release History
 
 * Implemented new `[platformio] <http://docs.platformio.org/en/latest/projectconf.html#platformio>`_
   section for Configuration File with `home_dir <http://docs.platformio.org/en/latest/projectconf.html#home-dir>`_
-  option (`issue #14 <https://github.com/ivankravets/platformio/issues/14>`_)
-* Implemented *Library Manager* (`issue #6 <https://github.com/ivankravets/platformio/issues/6>`_)
+  option (`issue #14 <https://github.com/platformio/platformio/issues/14>`_)
+* Implemented *Library Manager* (`issue #6 <https://github.com/platformio/platformio/issues/6>`_)
 
 0.6.0 (2014-08-09)
 ------------------
 
-* Implemented `platformio serialports monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_ (`issue #10 <https://github.com/ivankravets/platformio/issues/10>`_)
-* Fixed an issue ``ImportError: No module named platformio.util`` (`issue #9 <https://github.com/ivankravets/platformio/issues/9>`_)
+* Implemented `platformio serialports monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_ (`issue #10 <https://github.com/platformio/platformio/issues/10>`_)
+* Fixed an issue ``ImportError: No module named platformio.util`` (`issue #9 <https://github.com/platformio/platformio/issues/9>`_)
 * Fixed bug with auto-conversation from Arduino \*.ino to \*.cpp
 
 0.5.0 (2014-08-04)
@@ -259,12 +259,12 @@ Release History
 * Improved nested lookups for libraries
 * Disabled default warning flag "-Wall"
 * Added auto-conversation from \*.ino to valid \*.cpp for Arduino/Energia
-  frameworks (`issue #7 <https://github.com/ivankravets/platformio/issues/7>`_)
-* Added `Arduino example <https://github.com/ivankravets/platformio/tree/develop/examples/>`_
+  frameworks (`issue #7 <https://github.com/platformio/platformio/issues/7>`_)
+* Added `Arduino example <https://github.com/platformio/platformio/tree/develop/examples/>`_
   with external library (*Adafruit CC3000*)
 * Implemented `platformio upgrade <http://docs.platformio.org/en/latest/userguide/cmd_upgrade.html>`_
   command and "auto-check" for the latest
-  version (`issue #8 <https://github.com/ivankravets/platformio/issues/8>`_)
+  version (`issue #8 <https://github.com/platformio/platformio/issues/8>`_)
 * Fixed an issue with "auto-reset" for *Raspduino* board
 * Fixed a bug with nested libs building
 
@@ -299,17 +299,17 @@ Release History
 
 * Allowed to pass multiple "SomePlatform" to install/uninstall commands
 * Added "IDE Integration" section to README with Eclipse project examples
-* Created auto installer script for *PlatformIO* (`issue #3 <https://github.com/ivankravets/platformio/issues/3>`_)
+* Created auto installer script for *PlatformIO* (`issue #3 <https://github.com/platformio/platformio/issues/3>`_)
 * Added "Super-Quick" way to Installation section (README)
-* Implemented "build_flags" option for environments (`issue #4 <https://github.com/ivankravets/platformio/issues/4>`_)
+* Implemented "build_flags" option for environments (`issue #4 <https://github.com/platformio/platformio/issues/4>`_)
 
 
 0.2.0 (2014-06-15)
 ------------------
 
-* Resolved `issue #1 "Build referred libraries" <https://github.com/ivankravets/platformio/issues/1>`_
+* Resolved `issue #1 "Build referred libraries" <https://github.com/platformio/platformio/issues/1>`_
 * Renamed project's "libs" directory to "lib"
-* Added `arduino-internal-library <https://github.com/ivankravets/platformio/tree/develop/examples/>`_ example
+* Added `arduino-internal-library <https://github.com/platformio/platformio/tree/develop/examples/>`_ example
 * Changed to beta status
 
 
diff --git a/README.rst b/README.rst
index cde9bb2e..3724dd2b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
 PlatformIO
 ==========
 
-.. image:: https://travis-ci.org/ivankravets/platformio.svg?branch=develop
-    :target: https://travis-ci.org/ivankravets/platformio
+.. image:: https://travis-ci.org/platformio/platformio.svg?branch=develop
+    :target: https://travis-ci.org/profile/platformio
     :alt: Build Status
 .. image:: https://gemnasium.com/ivankravets/platformio.png
     :target: https://gemnasium.com/ivankravets/platformio
@@ -19,11 +19,11 @@ PlatformIO
 
 `Website + Library Search <http://platformio.org>`_ |
 `Documentation <http://docs.platformio.org>`_ |
-`Project Examples <https://github.com/ivankravets/platformio/tree/develop/examples>`_ |
+`Project Examples <https://github.com/platformio/platformio/tree/develop/examples>`_ |
 `Blog <http://www.ikravets.com/category/computer-life/platformio>`_ |
 `Twitter <https://twitter.com/PlatformIO_Org>`_
 
-.. image:: https://raw.githubusercontent.com/ivankravets/platformio/develop/docs/_static/platformio-logo.png
+.. image:: https://raw.githubusercontent.com/platformio/platformio/develop/docs/_static/platformio-logo.png
     :target: http://platformio.org
 
 `PlatformIO <http://platformio.org>`_ is a cross-platform code builder
@@ -57,7 +57,7 @@ Embedded Development. *Easier Than Ever.*
 *PlatformIO* is well suited for embedded development and has pre-configured
 settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
 
-* Colourful `command-line output <https://raw.githubusercontent.com/ivankravets/platformio/develop/examples/platformio-examples.png>`_
+* Colourful `command-line output <https://raw.githubusercontent.com/platformio/platformio/develop/examples/platformio-examples.png>`_
 * Built-in `Serial Port Monitor <http://docs.platformio.org/en/latest/userguide/cmd_serialports.html#platformio-serialports-monitor>`_
 * Configurable `build -flags/-options <http://docs.platformio.org/en/latest/projectconf.html#build-flags>`_
 * Automatic **firmware uploading**
diff --git a/docs/ide.rst b/docs/ide.rst
index a7dd0afc..af573259 100644
--- a/docs/ide.rst
+++ b/docs/ide.rst
@@ -21,7 +21,7 @@ Eclipse
     :target: http://www.ikravets.com/computer-life/programming/2014/06/20/building-and-debugging-atmel-avr-arduino-based-project-using-eclipse-ideplatformio
 
 * `Building and debugging Atmel AVR (Arduino-based) project using Eclipse IDE+PlatformIO <http://www.ikravets.com/computer-life/programming/2014/06/20/building-and-debugging-atmel-avr-arduino-based-project-using-eclipse-ideplatformio>`_
-* `More examples (TI MSP430, TI TIVA and etc) <https://github.com/ivankravets/platformio/tree/develop/examples/ide-eclipse>`_
+* `More examples (TI MSP430, TI TIVA and etc) <https://github.com/platformio/platformio/tree/develop/examples/ide-eclipse>`_
 
 Energia IDE
 -----------
diff --git a/docs/index.rst b/docs/index.rst
index 5cadf2bc..bacf22f1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,9 +5,9 @@ PlatformIO: A cross-platform code builder and the missing library manager
     :target: http://platformio.org
 
 `Website + Library Search <http://platformio.org>`_ |
-`Project Examples <https://github.com/ivankravets/platformio/tree/develop/examples>`_ |
+`Project Examples <https://github.com/platformio/platformio/tree/develop/examples>`_ |
 `Source Code <https://github.com/ivankravets/platformio>`_ |
-`Issues <https://github.com/ivankravets/platformio/issues>`_ |
+`Issues <https://github.com/platformio/platformio/issues>`_ |
 `Blog <http://www.ikravets.com/category/computer-life/platformio>`_ |
 `Twitter <https://twitter.com/PlatformIO_Org>`_
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 88d0edd3..75e566a5 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -49,14 +49,14 @@ To install or upgrade *PlatformIO* paste that at a *Terminal* prompt
 
 .. code-block:: bash
 
-    python -c "$(curl -fsSL https://raw.githubusercontent.com/ivankravets/platformio/master/scripts/get-platformio.py)"
+    python -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/master/scripts/get-platformio.py)"
 
 
 Installer Script (Mac / Linux / Windows)
 ----------------------------------------
 
 To install or upgrade *PlatformIO*, download
-`get-platformio.py <https://raw.githubusercontent.com/ivankravets/platformio/develop/scripts/get-platformio.py>`_
+`get-platformio.py <https://raw.githubusercontent.com/platformio/platformio/master/scripts/get-platformio.py>`_
 script. Then run the following (you might need to run ``sudo`` first):
 
 .. code-block:: bash
@@ -136,8 +136,8 @@ Development Version
 
 .. code-block:: bash
 
-    $ pip install https://github.com/ivankravets/platformio/archive/develop.zip
+    $ pip install https://github.com/platformio/platformio/archive/develop.zip
 
 If you want to be up-to-date with the latest ``develop`` version of PlatformIO,
 then you need to perform step #2 each time if you see the new commits in
-`PlatformIO GitHub repository <https://github.com/ivankravets/platformio/commits/develop>`_.
+`PlatformIO GitHub repository <https://github.com/platformio/platformio/commits/develop>`_.
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index bd8bcead..600f4ebc 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -31,7 +31,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/atmelsam.rst b/docs/platforms/atmelsam.rst
index a8e78bed..12b77aa8 100644
--- a/docs/platforms/atmelsam.rst
+++ b/docs/platforms/atmelsam.rst
@@ -31,7 +31,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index 9865beec..e1708ec3 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -238,7 +238,7 @@ base template of ``test-builder.py``.
     )
 
     # The source code of "platformio-build-tool" is here
-    # https://github.com/ivankravets/platformio/blob/develop/platformio/builder/tools/platformio.py
+    # https://github.com/platformio/platformio/blob/develop/platformio/builder/tools/platformio.py
 
     #
     # Target: Build executable and linkable firmware
diff --git a/docs/platforms/freescalekinetis.rst b/docs/platforms/freescalekinetis.rst
index 5f5eed08..3f8bbb03 100644
--- a/docs/platforms/freescalekinetis.rst
+++ b/docs/platforms/freescalekinetis.rst
@@ -25,7 +25,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/nordicnrf51.rst b/docs/platforms/nordicnrf51.rst
index 04ba9de2..90bf1ac9 100644
--- a/docs/platforms/nordicnrf51.rst
+++ b/docs/platforms/nordicnrf51.rst
@@ -25,7 +25,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/nxplpc.rst b/docs/platforms/nxplpc.rst
index fd2ed5ff..2bea9de5 100644
--- a/docs/platforms/nxplpc.rst
+++ b/docs/platforms/nxplpc.rst
@@ -25,7 +25,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/ststm32.rst b/docs/platforms/ststm32.rst
index 78e3f43f..215d239c 100644
--- a/docs/platforms/ststm32.rst
+++ b/docs/platforms/ststm32.rst
@@ -40,7 +40,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index 52c18e22..88b2fc05 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -34,7 +34,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/timsp430.rst b/docs/platforms/timsp430.rst
index b46b7219..19102624 100644
--- a/docs/platforms/timsp430.rst
+++ b/docs/platforms/timsp430.rst
@@ -31,7 +31,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/platforms/titiva.rst b/docs/platforms/titiva.rst
index 5d172bc2..2b02465f 100644
--- a/docs/platforms/titiva.rst
+++ b/docs/platforms/titiva.rst
@@ -34,7 +34,7 @@ Packages
 
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 
 
diff --git a/docs/projectconf.rst b/docs/projectconf.rst
index de21b0a6..df508ed5 100644
--- a/docs/projectconf.rst
+++ b/docs/projectconf.rst
@@ -73,7 +73,7 @@ This option can be overridden by global environment variable
 .. note::
     This option is useful for people who migrate from Arduino/Energia IDEs where
     source directory should have the same name like the main source file.
-    See `example <https://github.com/ivankravets/platformio/tree/develop/examples/atmelavr-and-arduino/arduino-own-src_dir>`__ project with own source directory.
+    See `example <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/arduino-own-src_dir>`__ project with own source directory.
 
 .. _projectconf_pio_envs_dir:
 
@@ -329,7 +329,7 @@ Examples
 
 .. note::
     A full list with project examples can be found in
-    `PlatformIO Repository <https://github.com/ivankravets/platformio/tree/develop/examples>`_.
+    `PlatformIO Repository <https://github.com/platformio/platformio/tree/develop/examples>`_.
 
 1. :ref:`platform_atmelavr`: Arduino UNO board with auto pre-configured
    ``board_*`` and ``upload_*`` options (use only ``board`` option) and Arduino
diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 16e20e36..f9296061 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -58,7 +58,7 @@ Change working directory to the project's root where is located
 If you don't have installed required platforms, then *PlatformIO* will propose
 you to install them automatically.
 
-Further examples can be found in `PlatformIO Repository <https://github.com/ivankravets/platformio/tree/develop/examples>`_.
+Further examples can be found in `PlatformIO Repository <https://github.com/platformio/platformio/tree/develop/examples>`_.
 
 Also, for more detailed information as for commands please go to
 :ref:`userguide` sections.
diff --git a/docs/userguide/cmd_run.rst b/docs/userguide/cmd_run.rst
index 2f7345f0..2dc833f4 100644
--- a/docs/userguide/cmd_run.rst
+++ b/docs/userguide/cmd_run.rst
@@ -42,7 +42,7 @@ Upload port of embedded board. To print all available ports use
 Examples
 --------
 
-1. Process `Wiring Blink Example <https://github.com/ivankravets/platformio/tree/develop/examples/wiring-blink>`_
+1. Process `Wiring Blink Example <https://github.com/platformio/platformio/tree/develop/examples/wiring-blink>`_
 
 .. code-block::   bash
 
diff --git a/examples/atmelavr-and-arduino/adafruit-blink/README.rst b/examples/atmelavr-and-arduino/adafruit-blink/README.rst
index ffccc76e..222ce460 100644
--- a/examples/atmelavr-and-arduino/adafruit-blink/README.rst
+++ b/examples/atmelavr-and-arduino/adafruit-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/atmelavr-and-arduino/arduino-external-libs/README.rst b/examples/atmelavr-and-arduino/arduino-external-libs/README.rst
index 634386f8..8a2d15fa 100644
--- a/examples/atmelavr-and-arduino/arduino-external-libs/README.rst
+++ b/examples/atmelavr-and-arduino/arduino-external-libs/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/atmelavr-and-arduino/arduino-internal-libs/README.rst b/examples/atmelavr-and-arduino/arduino-internal-libs/README.rst
index f510bf29..826cc34e 100644
--- a/examples/atmelavr-and-arduino/arduino-internal-libs/README.rst
+++ b/examples/atmelavr-and-arduino/arduino-internal-libs/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/atmelavr-and-arduino/arduino-own-src_dir/README.rst b/examples/atmelavr-and-arduino/arduino-own-src_dir/README.rst
index 8c5469cf..ec75a15c 100644
--- a/examples/atmelavr-and-arduino/arduino-own-src_dir/README.rst
+++ b/examples/atmelavr-and-arduino/arduino-own-src_dir/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/atmelavr-and-arduino/atmelavr-native-blink/README.rst b/examples/atmelavr-and-arduino/atmelavr-native-blink/README.rst
index 4edae991..7ba51060 100644
--- a/examples/atmelavr-and-arduino/atmelavr-native-blink/README.rst
+++ b/examples/atmelavr-and-arduino/atmelavr-native-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/atmelavr-and-arduino/digitstump-mouse/README.rst b/examples/atmelavr-and-arduino/digitstump-mouse/README.rst
index 0a7076bc..97b6e46d 100644
--- a/examples/atmelavr-and-arduino/digitstump-mouse/README.rst
+++ b/examples/atmelavr-and-arduino/digitstump-mouse/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/atmelavr-and-arduino/engduino-magnetometer/README.rst b/examples/atmelavr-and-arduino/engduino-magnetometer/README.rst
index 71ef0514..6639e20c 100644
--- a/examples/atmelavr-and-arduino/engduino-magnetometer/README.rst
+++ b/examples/atmelavr-and-arduino/engduino-magnetometer/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/atmelavr-and-arduino/panstamp-blink/README.rst b/examples/atmelavr-and-arduino/panstamp-blink/README.rst
index eb66f295..a3a0035f 100644
--- a/examples/atmelavr-and-arduino/panstamp-blink/README.rst
+++ b/examples/atmelavr-and-arduino/panstamp-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/mbed/mbed-blink/README.rst b/examples/mbed/mbed-blink/README.rst
index cc6c6377..50389eb4 100644
--- a/examples/mbed/mbed-blink/README.rst
+++ b/examples/mbed/mbed-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/mbed/mbed-dsp/README.rst b/examples/mbed/mbed-dsp/README.rst
index 557272de..70645910 100644
--- a/examples/mbed/mbed-dsp/README.rst
+++ b/examples/mbed/mbed-dsp/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/mbed/mbed-http-client/README.rst b/examples/mbed/mbed-http-client/README.rst
index c7f23685..b2aa2faf 100644
--- a/examples/mbed/mbed-http-client/README.rst
+++ b/examples/mbed/mbed-http-client/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/mbed/mbed-rtos/README.rst b/examples/mbed/mbed-rtos/README.rst
index 6411da4b..b2e6ff03 100644
--- a/examples/mbed/mbed-rtos/README.rst
+++ b/examples/mbed/mbed-rtos/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 ====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/mbed/mbed-serial/README.rst b/examples/mbed/mbed-serial/README.rst
index 7f1feb4a..11cc9a66 100644
--- a/examples/mbed/mbed-serial/README.rst
+++ b/examples/mbed/mbed-serial/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/stm32/stm32-cmsis-blink/README.rst b/examples/stm32/stm32-cmsis-blink/README.rst
index 0c1b987b..f02757ad 100644
--- a/examples/stm32/stm32-cmsis-blink/README.rst
+++ b/examples/stm32/stm32-cmsis-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/stm32/stm32-opencm3-blink/README.rst b/examples/stm32/stm32-opencm3-blink/README.rst
index b2df8478..32f77fe0 100644
--- a/examples/stm32/stm32-opencm3-blink/README.rst
+++ b/examples/stm32/stm32-opencm3-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/stm32/stm32-spl-blink/README.rst b/examples/stm32/stm32-spl-blink/README.rst
index 8ed58571..32ba57d8 100644
--- a/examples/stm32/stm32-spl-blink/README.rst
+++ b/examples/stm32/stm32-spl-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/teensy/teensy-internal-libs/README.rst b/examples/teensy/teensy-internal-libs/README.rst
index e1a1cc9a..58dccb21 100644
--- a/examples/teensy/teensy-internal-libs/README.rst
+++ b/examples/teensy/teensy-internal-libs/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/timsp430/panstamp-blink/README.rst b/examples/timsp430/panstamp-blink/README.rst
index 6e7c06b7..9a95c87d 100644
--- a/examples/timsp430/panstamp-blink/README.rst
+++ b/examples/timsp430/panstamp-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/timsp430/timsp430-energia-blink/README.rst b/examples/timsp430/timsp430-energia-blink/README.rst
index 7ad63a62..bd60b1cc 100644
--- a/examples/timsp430/timsp430-energia-blink/README.rst
+++ b/examples/timsp430/timsp430-energia-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/timsp430/timsp430-native-blink/README.rst b/examples/timsp430/timsp430-native-blink/README.rst
index 5014d0ce..b7e2c7f9 100644
--- a/examples/timsp430/timsp430-native-blink/README.rst
+++ b/examples/timsp430/timsp430-native-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/titiva/titiva-energia-blink/README.rst b/examples/titiva/titiva-energia-blink/README.rst
index 3f182624..3d49993d 100644
--- a/examples/titiva/titiva-energia-blink/README.rst
+++ b/examples/titiva/titiva-energia-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/titiva/titiva-native-blink/README.rst b/examples/titiva/titiva-native-blink/README.rst
index 109f2ebb..a97487da 100644
--- a/examples/titiva/titiva-native-blink/README.rst
+++ b/examples/titiva/titiva-native-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/titiva/titiva-opencm3-blink/README.rst b/examples/titiva/titiva-opencm3-blink/README.rst
index d3a83202..29e2d37f 100644
--- a/examples/titiva/titiva-opencm3-blink/README.rst
+++ b/examples/titiva/titiva-opencm3-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/examples/wiring-blink/README.rst b/examples/wiring-blink/README.rst
index 8dbda11e..22a843ac 100644
--- a/examples/wiring-blink/README.rst
+++ b/examples/wiring-blink/README.rst
@@ -2,7 +2,7 @@ How to build PlatformIO based project
 =====================================
 
 1. `Install PlatformIO <http://docs.platformio.org/en/latest/installation.html>`_
-2. Download `source code with examples <https://github.com/ivankravets/platformio/archive/develop.zip>`_
+2. Download `source code with examples <https://github.com/platformio/platformio/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:
 
diff --git a/scripts/99-platformio-udev.rules b/scripts/99-platformio-udev.rules
index 34045ef3..dabde7d5 100644
--- a/scripts/99-platformio-udev.rules
+++ b/scripts/99-platformio-udev.rules
@@ -4,7 +4,7 @@
 # UDEV Rules for PlatformIO supproted boards, http://platformio.org/#!/boards
 #
 # The latest version of this file may be found at:
-# 	https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules
+# 	https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules
 #
 # This file must be placed at:
 # 	/etc/udev/rules.d/99-platformio-udev.rules    (preferred location)
@@ -51,7 +51,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789]?", MODE:=
 KERNEL=="ttyACM*", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="04[789]?", MODE:="0666"
 
 #TI Stellaris Launchpad
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE="0666" 
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00fd", MODE="0666"
 
 #TI MSP430 Launchpad
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="0451", ATTRS{idProduct}=="f432", MODE="0666"
diff --git a/scripts/docspregen.py b/scripts/docspregen.py
index d07afb95..86bb60d6 100644
--- a/scripts/docspregen.py
+++ b/scripts/docspregen.py
@@ -89,7 +89,7 @@ def generate_packages(packages):
     lines.append("""
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
-    `99-platformio-udev.rules <https://github.com/ivankravets/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
+    `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
 
 """)
     return "\n".join(lines)
diff --git a/scripts/get-platformio.py b/scripts/get-platformio.py
index 47d34bc7..fd792b25 100644
--- a/scripts/get-platformio.py
+++ b/scripts/get-platformio.py
@@ -123,7 +123,7 @@ def main():
     if is_error:
         print ("The installation process has been FAILED!\n"
                "Please report about this problem here\n"
-               "< https://github.com/ivankravets/platformio/issues >")
+               "< https://github.com/platformio/platformio/issues >")
         return
     else:
         print ("\n ==> Installation process has been "