diff --git a/README.md b/README.md
index 7b437d42..1da1699b 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,20 @@
| Area | Status |
|------------------------------|----------------------------------------------------------------------------------------------------|
-| Community | [](https://stackoverflow.com/questions/tagged/generalbots) [](https://gitter.im/GeneralBots) [](https://badges.frapsoft.com) [](http://makeapullrequest.com) [](https://github.com/pragmatismo-io/BotServer/blob/master/LICENSE.txt)|
-| Management | [](https://gitHub.com/pragmatismo-io/BotServer/graphs/commit-activity) [](https://waffle.io/pragmatismo-io/BotServer) |
-| Security | [](https://snyk.io/test/github/pragmatismo-io/BotServer) |
-| Building & Quality | [](https://travis-ci.com/pragmatismo-io/BotServer) [](https://coveralls.io/github/pragmatismo-io/BotServer) [](https://github.com/prettier/prettier) |
-| Packaging | [](https://badge.fury.io) [](https://david-dm.org) [](https://greenkeeper.io/) [](http://commitizen.github.io/cz-cli/) |
+| Community | [](https://stackoverflow.com/questions/tagged/generalbots) [](https://gitter.im/GeneralBots) [](https://badges.frapsoft.com) [](http://makeapullrequest.com) [](https://github.com/GeneralBots/BotServer/blob/master/LICENSE.txt)|
+| Management | [](https://gitHub.com/GeneralBots/BotServer/graphs/commit-activity) |
+| Security | [](https://snyk.io/test/github/GeneralBots/BotServer) |
+| Building & Quality | [](https://travis-ci.com/GeneralBots/BotServer) [](https://coveralls.io/github/GeneralBots/BotServer) [](https://github.com/prettier/prettier) |
+| Packaging | [](https://badge.fury.io) [](https://david-dm.org) [](https://greenkeeper.io/) [](http://commitizen.github.io/cz-cli/) |
| Releases | [](https://www.npmjs.com/package/botserver/) [](https://www.npmjs.com/package/botlib/) [](https://github.com/semantic-release/semantic-release)|
-| Samples | [default.gbdialog (VBA)](https://github.com/pragmatismo-io/BotServer/tree/master/packages/default.gbdialog) [AzureADPasswordReset.gbapp (TypeScript)](https://github.com/pragmatismo-io/AzureADPasswordReset.gbapp)|
+| Samples | [VBA](https://github.com/GeneralBots/BotServer/tree/master/packages/default.gbdialog) or [TypeScript](https://github.com/GeneralBots/AzureADPasswordReset.gbapp)|
| [Docker Image](https://github.com/lpicanco/docker-botserver) |     
*Provided by [@lpicanco](https://github.com/lpicanco/docker-botserver)* |
+General Bots
+------------------
+
+
+
+
General Bots
------------------
@@ -38,7 +44,22 @@ editor). BASIC can be used to build custom dialogs so Bot can be extended just l
[Read the General Bots Guide](https://github.com/GeneralBots/BotBook/tree/master/book).
-## Contributing
+# Videos
+
+## Easeness authoring of bot packages, development environment and self-deployment.
+
+* Now with the General Bots server you can press F5 on Visual Studio to get a bot factory on your environment* published on November 10th, 2018.
+
+[](https://www.youtube.com/watch?v=AfKTwljoMOs)
+
+## Using TALK and HEAR to build Virtual Assistants with BASIC
+
+* See how easy is to use 'hear' and 'talk' to build Microsoft BOT Framework v4 logic with plain BASIC * published on December 3rd, 2018.
+
+[](https://www.youtube.com/watch?v=yX1sF9n9628)
+
+
+ ## Contributing
This project welcomes contributions and suggestions.
See our [Contribution Guidelines](https://github.com/pragmatismo-io/BotServer/blob/master/CONTRIBUTING.md) for more details.
@@ -75,20 +96,3 @@ our trademarks remain entirely with us.
:speech_balloon: Ask a question :book: Read the Docs
-
-
-# Videos
-
-## Easeness authoring of bot packages, development environment and self-deployment.
-
-* Now with the General Bots server you can press F5 on Visual Studio to get a bot factory on your environment* published on November 10th, 2018.
-
-[](https://www.youtube.com/watch?v=AfKTwljoMOs)
-
-## Using TALK and HEAR to build Virtual Assistants with BASIC
-
-* See how easy is to use 'hear' and 'talk' to build Microsoft BOT Framework v4 logic with plain BASIC * published on December 3rd, 2018.
-
-[](https://www.youtube.com/watch?v=yX1sF9n9628)
-
-