diff --git a/CHANGELOG.md b/CHANGELOG.md
index 262fc7dd..8a64dfc7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Add: `bootstrapURLKeys` (object) instead of `apiKey` prop
 Example:
 
 ```javascript
-<GoogleMap 
+<GoogleMap
   bootstrapURLKeys={{
     key: API_KEY,
     language: 'ru',
@@ -34,7 +34,7 @@ Add `utils` functions, with `fitBounds` and other functions
 ```javascript
   import { fitBounds } from 'google-map-react/utils';
 
-  const bounds = { 
+  const bounds = {
     nw: {
       lat: 50.01038826014866,
       lng: -118.6525866875,
@@ -44,7 +44,7 @@ Add `utils` functions, with `fitBounds` and other functions
       lng: -92.0217273125,
      },
   };
-  
+
   const size = {
     width: 640, // Map width in pixels
     height: 380, // Map height in pixels
diff --git a/DOC.md b/DOC.md
index 2e5351bc..c2e08350 100644
--- a/DOC.md
+++ b/DOC.md
@@ -45,7 +45,7 @@ On creation map uses the space of parent container and if parent container has z
 the map will be not visible. (_This is one of the most common issue_)
 
 If you want to place map inside `display: flex` container you need to pass `style` property
-with `{ flex: 1 }` to the control as like as [here](https://github.com/istarkov/google-map-thousands-markers/blob/master/src/Map.js#L32)
+with `{ flex: 1 }` to the control as like as [here](https://github.com/google-map-react/google-map-thousands-markers/blob/master/src/Map.js#L32)
 
 By default map will not raise `onChange` event if parent size has changed, to change such behavior
 add `resetBoundsOnResize = {true}` property.
@@ -118,7 +118,7 @@ marker position, and any other properties you want.
 
   At the example above I use some kind of rectangular distance.
 
-  [Other distanceToMouse example](https://github.com/istarkov/google-map-react-examples/blob/dbfc2fcd381cc39da315875f5a45d4ebee765f26/web/flux/components/examples/x_distance_hover/distance_hover_map_page.jsx#L31-L46)
+  [Other distanceToMouse example](https://github.com/google-map-react/google-map-react-examples/blob/dbfc2fcd381cc39da315875f5a45d4ebee765f26/web/flux/components/examples/x_distance_hover/distance_hover_map_page.jsx#L31-L46)
 
 
 - `hoverDistance: number` distance threshold,
diff --git a/README.md b/README.md
index a9777732..c0a9e44c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Google Map React &middot; [![npm version](https://badge.fury.io/js/google-map-react.svg)](http://badge.fury.io/js/google-map-react) [![Build Status](https://travis-ci.org/istarkov/google-map-react.svg?branch=master)](https://travis-ci.org/istarkov/google-map-react) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](github.com/istarkov/google-map-react/CONTRIBUTING.md)
+/google-map-react# Google Map React &middot; [![npm version](https://badge.fury.io/js/google-map-react.svg)](http://badge.fury.io/js/google-map-react) [![Build Status](https://travis-ci.org/google-map-react/google-map-react.svg?branch=master)](https://travis-ci.org/google-map-react/google-map-react) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](github.com/google-map-react/google-map-react/CONTRIBUTING.md)
 
 `google-map-react` is a component written over a small set of the [Google Maps API](https://developers.google.com/maps/). It allows you to render any React component on the Google Map. It is fully isomorphic and can render on a server. Additionally, it can render map components in the browser even if the Google Maps API is not loaded. It uses an internal, tweakable hover algorithm - every object on the map can be hovered.
 
-It allows you to create interfaces like this [example](http://istarkov.github.io/google-map-react/map/main) *(You can scroll the table, zoom/move the map, hover/click on markers, and click on table rows)*
+It allows you to create interfaces like this [example](http://google-map-react.github.io/google-map-react/map/main) *(You can scroll the table, zoom/move the map, hover/click on markers, and click on table rows)*
 
 ## Getting started
 
@@ -85,34 +85,34 @@ There is no need to place a `<script src=` tag at top of page. The Google Maps A
 
 ### Internal Hover Algorithm
 
-Now every object on the map can be hovered (however, you can still use css hover selectors if you want). If you try zooming out here [example](http://istarkov.github.io/google-map-react/map/main), you will still be able to hover on almost every map marker.
+Now every object on the map can be hovered (however, you can still use css hover selectors if you want). If you try zooming out here [example](http://google-map-react.github.io/google-map-react/map/main), you will still be able to hover on almost every map marker.
 
 ## Examples
 
 * Placing react components on the map:
-[simple](http://istarkov.github.io/google-map-react/map/simple/) ([source](https://github.com/istarkov/google-map-react-examples/blob/master/web/flux/components/examples/x_simple/simple_map_page.jsx))
+[simple](http://google-map-react.github.io/google-map-react/map/simple/) ([source](https://github.com/google-map-react/google-map-react-examples/blob/master/web/flux/components/examples/x_simple/simple_map_page.jsx))
 
 * Custom map options:
-[example](http://istarkov.github.io/google-map-react/map/options/) ([source](https://github.com/istarkov/google-map-react-examples/blob/master/web/flux/components/examples/x_options/options_map_page.jsx))
+[example](http://google-map-react.github.io/google-map-react/map/options/) ([source](https://github.com/google-map-react/google-map-react-examples/blob/master/web/flux/components/examples/x_options/options_map_page.jsx))
 
 * Hover effects:
-[simple hover](http://istarkov.github.io/google-map-react/map/simple_hover/) ([source](https://github.com/istarkov/google-map-react-examples/blob/master/web/flux/components/examples/x_simple_hover/simple_hover_map_page.jsx));
-[distance hover](http://istarkov.github.io/google-map-react/map/distance_hover/) ([source](https://github.com/istarkov/google-map-react-examples/blob/master/web/flux/components/examples/x_distance_hover/distance_hover_map_page.jsx))
+[simple hover](http://google-map-react.github.io/google-map-react/map/simple_hover/) ([source](https://github.com/google-map-react/google-map-react-examples/blob/master/web/flux/components/examples/x_simple_hover/simple_hover_map_page.jsx));
+[distance hover](http://google-map-react.github.io/google-map-react/map/distance_hover/) ([source](https://github.com/google-map-react/google-map-react-examples/blob/master/web/flux/components/examples/x_distance_hover/distance_hover_map_page.jsx))
 
 * GoogleMap events:
-[example](http://istarkov.github.io/google-map-react/map/events/) ([source](https://github.com/istarkov/google-map-react-examples/blob/master/web/flux/components/examples/x_events/events_map_page.jsx))
+[example](http://google-map-react.github.io/google-map-react/map/events/) ([source](https://github.com/google-map-react/google-map-react-examples/blob/master/web/flux/components/examples/x_events/events_map_page.jsx))
 
 * Example project:
-[main](http://istarkov.github.io/google-map-react/map/main/) ([source](https://github.com/istarkov/google-map-react-examples/blob/master/web/flux/components/examples/x_main/main_map_block.jsx)); [balderdash](http://istarkov.github.io/google-map-react/map/balderdash/) (same source as main)
+[main](http://google-map-react.github.io/google-map-react/map/main/) ([source](https://github.com/google-map-react/google-map-react-examples/blob/master/web/flux/components/examples/x_main/main_map_block.jsx)); [balderdash](http://google-map-react.github.io/google-map-react/map/balderdash/) (same source as main)
 
-* Clustering example ([source](https://github.com/istarkov/google-map-clustering-example))
-[google-map-clustering-example](http://istarkov.github.io/google-map-clustering-example/)
+* Clustering example ([source](https://github.com/google-map-react/google-map-clustering-example))
+[google-map-clustering-example](http://google-map-react.github.io/google-map-clustering-example/)
 
 * How to render thousands of markers (**new**)
-[google-map-thousands-markers](https://istarkov.github.io/google-map-thousands-markers/)
+[google-map-thousands-markers](https://google-map-react.github.io/google-map-thousands-markers/)
 
 * All api examples:
-[google-map-react-examples](https://github.com/istarkov/google-map-react-examples)
+[google-map-react-examples](https://github.com/google-map-react/google-map-react-examples)
 
 * jsbin example
 [jsbin example](https://jsbin.com/roqutisoqu/1/edit?js,console,output)
diff --git a/bower.json b/bower.json
index b194263b..a9df7796 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
   "name": "google-map-react",
   "description": "isomorphic google map react component, allows render react components on the google map",
   "main": "lib/umd/GoogleMapReact.js",
-  "homepage": "https://github.com/istarkov/google-map-react",
+  "homepage": "https://github.com/google-map-react/google-map-react",
   "authors": [
     "Ivan Starkov <istarkov@gmail.com>"
   ],
diff --git a/package.json b/package.json
index c5c17faf..9c55035a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/istarkov/google-map-react.git"
+    "url": "git+https://github.com/google-map-react/google-map-react.git"
   },
   "keywords": [
     "react",
@@ -38,9 +38,9 @@
   "author": "istarkov https://github.com/istarkov",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/istarkov/google-map-react/issues"
+    "url": "https://github.com/google-map-react/google-map-react/issues"
   },
-  "homepage": "https://github.com/istarkov/google-map-react#readme",
+  "homepage": "https://github.com/google-map-react/google-map-react#readme",
   "peerDependencies": {
     "prop-types": "^15.5.6",
     "react": "^0.14.0 || ^15.0.0 || ^16.0.0"