diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e4765e..64f569a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,30 +8,30 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Bug Fixes
 
-* **plugin:** load correct plugin files ([548892d](https://github.com/bleech/acf-field-group-composer/commit/548892d))
-* **resolveConfig:** add prefix to field name if filter param specified ([0a49e75](https://github.com/bleech/acf-field-group-composer/commit/0a49e75))
-* **resolveConfig:** arrays of fields work now without showing a notice in ACF call ([6b3ab5e](https://github.com/bleech/acf-field-group-composer/commit/6b3ab5e))
+* **plugin:** load correct plugin files ([548892d](https://github.com/flyntwp/acf-field-group-composer/commit/548892d))
+* **resolveConfig:** add prefix to field name if filter param specified ([0a49e75](https://github.com/flyntwp/acf-field-group-composer/commit/0a49e75))
+* **resolveConfig:** arrays of fields work now without showing a notice in ACF call ([6b3ab5e](https://github.com/flyntwp/acf-field-group-composer/commit/6b3ab5e))
 
 
 ### Features
 
-* **ACFComposer:** add basic registerFieldGroup method ([53e147e](https://github.com/bleech/acf-field-group-composer/commit/53e147e))
-* **composer:** add composer installers and type wordpress plugin ([798935a](https://github.com/bleech/acf-field-group-composer/commit/798935a))
-* **composer:** add composer package info ([465ea94](https://github.com/bleech/acf-field-group-composer/commit/465ea94))
-* **composer:** autoload acf-field-group-composer.php ([dea8300](https://github.com/bleech/acf-field-group-composer/commit/dea8300))
-* **field:** basic config validation ([b1b7ce3](https://github.com/bleech/acf-field-group-composer/commit/b1b7ce3))
-* **field:** get field config from passed filter name ([0629020](https://github.com/bleech/acf-field-group-composer/commit/0629020))
-* **layout:** add basic layout class ([796b862](https://github.com/bleech/acf-field-group-composer/commit/796b862))
-* **resolve config:** use hashtag to reuse same copnt multiple times in same layout ([d27c63b](https://github.com/bleech/acf-field-group-composer/commit/d27c63b))
-* **resolveConfig:** added check for unapplied filters ([e3b86ea](https://github.com/bleech/acf-field-group-composer/commit/e3b86ea))
-* **ResolveConfig:** add multiple fields from filter ([80d252c](https://github.com/bleech/acf-field-group-composer/commit/80d252c))
-* **ResolveConfig:** apply resolveEntity filters ([66d7596](https://github.com/bleech/acf-field-group-composer/commit/66d7596))
-* **ResolveConfig:** basic resolve for field groups ([d2438df](https://github.com/bleech/acf-field-group-composer/commit/d2438df))
-* **ResolveConfig:** for conditional logic with field on ancestor level ([5192d70](https://github.com/bleech/acf-field-group-composer/commit/5192d70))
-* **ResolveConfig:** for conditional logic with field on same level ([eaa228d](https://github.com/bleech/acf-field-group-composer/commit/eaa228d))
-* **ResolveConfig:** generate key for fields and layouts, including nested ([cc670a6](https://github.com/bleech/acf-field-group-composer/commit/cc670a6))
-* **ResolveConfig:** make resolve field group fail on invalid location and field ([4924c75](https://github.com/bleech/acf-field-group-composer/commit/4924c75))
-* **ResolveConfig:** resolve sub_fields ([f32ea4c](https://github.com/bleech/acf-field-group-composer/commit/f32ea4c))
+* **ACFComposer:** add basic registerFieldGroup method ([53e147e](https://github.com/flyntwp/acf-field-group-composer/commit/53e147e))
+* **composer:** add composer installers and type wordpress plugin ([798935a](https://github.com/flyntwp/acf-field-group-composer/commit/798935a))
+* **composer:** add composer package info ([465ea94](https://github.com/flyntwp/acf-field-group-composer/commit/465ea94))
+* **composer:** autoload acf-field-group-composer.php ([dea8300](https://github.com/flyntwp/acf-field-group-composer/commit/dea8300))
+* **field:** basic config validation ([b1b7ce3](https://github.com/flyntwp/acf-field-group-composer/commit/b1b7ce3))
+* **field:** get field config from passed filter name ([0629020](https://github.com/flyntwp/acf-field-group-composer/commit/0629020))
+* **layout:** add basic layout class ([796b862](https://github.com/flyntwp/acf-field-group-composer/commit/796b862))
+* **resolve config:** use hashtag to reuse same copnt multiple times in same layout ([d27c63b](https://github.com/flyntwp/acf-field-group-composer/commit/d27c63b))
+* **resolveConfig:** added check for unapplied filters ([e3b86ea](https://github.com/flyntwp/acf-field-group-composer/commit/e3b86ea))
+* **ResolveConfig:** add multiple fields from filter ([80d252c](https://github.com/flyntwp/acf-field-group-composer/commit/80d252c))
+* **ResolveConfig:** apply resolveEntity filters ([66d7596](https://github.com/flyntwp/acf-field-group-composer/commit/66d7596))
+* **ResolveConfig:** basic resolve for field groups ([d2438df](https://github.com/flyntwp/acf-field-group-composer/commit/d2438df))
+* **ResolveConfig:** for conditional logic with field on ancestor level ([5192d70](https://github.com/flyntwp/acf-field-group-composer/commit/5192d70))
+* **ResolveConfig:** for conditional logic with field on same level ([eaa228d](https://github.com/flyntwp/acf-field-group-composer/commit/eaa228d))
+* **ResolveConfig:** generate key for fields and layouts, including nested ([cc670a6](https://github.com/flyntwp/acf-field-group-composer/commit/cc670a6))
+* **ResolveConfig:** make resolve field group fail on invalid location and field ([4924c75](https://github.com/flyntwp/acf-field-group-composer/commit/4924c75))
+* **ResolveConfig:** resolve sub_fields ([f32ea4c](https://github.com/flyntwp/acf-field-group-composer/commit/f32ea4c))
 
 
 
@@ -41,27 +41,27 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Bug Fixes
 
-* **plugin:** load correct plugin files ([548892d](https://github.com/bleech/acf-field-group-composer/commit/548892d))
-* **resolveConfig:** add prefix to field name if filter param specified ([0a49e75](https://github.com/bleech/acf-field-group-composer/commit/0a49e75))
-* **resolveConfig:** arrays of fields work now without showing a notice in ACF call ([6b3ab5e](https://github.com/bleech/acf-field-group-composer/commit/6b3ab5e))
+* **plugin:** load correct plugin files ([548892d](https://github.com/flyntwp/acf-field-group-composer/commit/548892d))
+* **resolveConfig:** add prefix to field name if filter param specified ([0a49e75](https://github.com/flyntwp/acf-field-group-composer/commit/0a49e75))
+* **resolveConfig:** arrays of fields work now without showing a notice in ACF call ([6b3ab5e](https://github.com/flyntwp/acf-field-group-composer/commit/6b3ab5e))
 
 
 ### Features
 
-* **ACFComposer:** add basic registerFieldGroup method ([53e147e](https://github.com/bleech/acf-field-group-composer/commit/53e147e))
-* **composer:** add composer installers and type wordpress plugin ([798935a](https://github.com/bleech/acf-field-group-composer/commit/798935a))
-* **composer:** add composer package info ([465ea94](https://github.com/bleech/acf-field-group-composer/commit/465ea94))
-* **composer:** autoload acf-field-group-composer.php ([dea8300](https://github.com/bleech/acf-field-group-composer/commit/dea8300))
-* **field:** basic config validation ([b1b7ce3](https://github.com/bleech/acf-field-group-composer/commit/b1b7ce3))
-* **field:** get field config from passed filter name ([0629020](https://github.com/bleech/acf-field-group-composer/commit/0629020))
-* **layout:** add basic layout class ([796b862](https://github.com/bleech/acf-field-group-composer/commit/796b862))
-* **resolve config:** use hashtag to reuse same copnt multiple times in same layout ([d27c63b](https://github.com/bleech/acf-field-group-composer/commit/d27c63b))
-* **resolveConfig:** added check for unapplied filters ([e3b86ea](https://github.com/bleech/acf-field-group-composer/commit/e3b86ea))
-* **ResolveConfig:** add multiple fields from filter ([80d252c](https://github.com/bleech/acf-field-group-composer/commit/80d252c))
-* **ResolveConfig:** apply resolveEntity filters ([66d7596](https://github.com/bleech/acf-field-group-composer/commit/66d7596))
-* **ResolveConfig:** basic resolve for field groups ([d2438df](https://github.com/bleech/acf-field-group-composer/commit/d2438df))
-* **ResolveConfig:** for conditional logic with field on ancestor level ([5192d70](https://github.com/bleech/acf-field-group-composer/commit/5192d70))
-* **ResolveConfig:** for conditional logic with field on same level ([eaa228d](https://github.com/bleech/acf-field-group-composer/commit/eaa228d))
-* **ResolveConfig:** generate key for fields and layouts, including nested ([cc670a6](https://github.com/bleech/acf-field-group-composer/commit/cc670a6))
-* **ResolveConfig:** make resolve field group fail on invalid location and field ([4924c75](https://github.com/bleech/acf-field-group-composer/commit/4924c75))
-* **ResolveConfig:** resolve sub_fields ([f32ea4c](https://github.com/bleech/acf-field-group-composer/commit/f32ea4c))
+* **ACFComposer:** add basic registerFieldGroup method ([53e147e](https://github.com/flyntwp/acf-field-group-composer/commit/53e147e))
+* **composer:** add composer installers and type wordpress plugin ([798935a](https://github.com/flyntwp/acf-field-group-composer/commit/798935a))
+* **composer:** add composer package info ([465ea94](https://github.com/flyntwp/acf-field-group-composer/commit/465ea94))
+* **composer:** autoload acf-field-group-composer.php ([dea8300](https://github.com/flyntwp/acf-field-group-composer/commit/dea8300))
+* **field:** basic config validation ([b1b7ce3](https://github.com/flyntwp/acf-field-group-composer/commit/b1b7ce3))
+* **field:** get field config from passed filter name ([0629020](https://github.com/flyntwp/acf-field-group-composer/commit/0629020))
+* **layout:** add basic layout class ([796b862](https://github.com/flyntwp/acf-field-group-composer/commit/796b862))
+* **resolve config:** use hashtag to reuse same copnt multiple times in same layout ([d27c63b](https://github.com/flyntwp/acf-field-group-composer/commit/d27c63b))
+* **resolveConfig:** added check for unapplied filters ([e3b86ea](https://github.com/flyntwp/acf-field-group-composer/commit/e3b86ea))
+* **ResolveConfig:** add multiple fields from filter ([80d252c](https://github.com/flyntwp/acf-field-group-composer/commit/80d252c))
+* **ResolveConfig:** apply resolveEntity filters ([66d7596](https://github.com/flyntwp/acf-field-group-composer/commit/66d7596))
+* **ResolveConfig:** basic resolve for field groups ([d2438df](https://github.com/flyntwp/acf-field-group-composer/commit/d2438df))
+* **ResolveConfig:** for conditional logic with field on ancestor level ([5192d70](https://github.com/flyntwp/acf-field-group-composer/commit/5192d70))
+* **ResolveConfig:** for conditional logic with field on same level ([eaa228d](https://github.com/flyntwp/acf-field-group-composer/commit/eaa228d))
+* **ResolveConfig:** generate key for fields and layouts, including nested ([cc670a6](https://github.com/flyntwp/acf-field-group-composer/commit/cc670a6))
+* **ResolveConfig:** make resolve field group fail on invalid location and field ([4924c75](https://github.com/flyntwp/acf-field-group-composer/commit/4924c75))
+* **ResolveConfig:** resolve sub_fields ([f32ea4c](https://github.com/flyntwp/acf-field-group-composer/commit/f32ea4c))
diff --git a/README.md b/README.md
index 5052f9f..a52f441 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # acf-field-group-composer
 
 [![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
-[![Build Status](https://img.shields.io/travis/bleech/acf-field-group-composer.svg?style=flat-square)](https://travis-ci.org/bleech/acf-field-group-composer)
-[![Code Quality](https://img.shields.io/scrutinizer/g/bleech/acf-field-group-composer.svg?style=flat-square)](https://scrutinizer-ci.com/g/bleech/acf-field-group-composer)
-[![Code Coverage](https://img.shields.io/coveralls/bleech/acf-field-group-composer.svg?style=flat-square)](https://coveralls.io/github/bleech/acf-field-group-composer)
+[![Build Status](https://img.shields.io/travis/flyntwp/acf-field-group-composer.svg?style=flat-square)](https://travis-ci.org/flyntwp/acf-field-group-composer)
+[![Code Quality](https://img.shields.io/scrutinizer/g/flyntwp/acf-field-group-composer.svg?style=flat-square)](https://scrutinizer-ci.com/g/flyntwp/acf-field-group-composer)
+[![Code Coverage](https://img.shields.io/coveralls/flyntwp/acf-field-group-composer.svg?style=flat-square)](https://coveralls.io/github/flyntwp/acf-field-group-composer)
 
 > Configuration builder for advanced custom fields field groups
 
@@ -296,7 +296,7 @@ The main people in charge of this repo are:
 
 ## Contribute
 
-To contribute, please use github [issues](https://github.com/bleech/acf-field-group-composer/issues). Pull requests are accepted.
+To contribute, please use github [issues](https://github.com/flyntwp/acf-field-group-composer/issues). Pull requests are accepted.
 
 Small note: If editing the README, please conform to the [standard-readme](https://github.com/RichardLitt/standard-readme) specification.
 
diff --git a/package.json b/package.json
index 056f008..6633260 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "acf-field-group-composer",
   "version": "1.0.0-rc1",
-  "repository": "git@github.com:bleech/acf-field-group-composer.git",
+  "repository": "git@github.com:flyntwp/acf-field-group-composer.git",
   "author": "bleech <hello@bleech.de>",
   "license": "MIT",
   "devDependencies": {