diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 0000000..c619d97
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,21 @@
+engines:
+     fixme:
+       enabled: true
+    pmd:
+       enabled: true
+       channel: beta
+    tslint:
+       enabled: true
+       channel: beta
+       config:  environment.monitor.ui/tslint.json
+
+ratings:
+   paths:
+   - "environment.monitor.server/**/*"
+   - "environment.monitor.core/**/*"
+   - "environment.monitor.runner/**/*"
+   - "environment.monitor.plugins/**/*"
+   - "environment.monitor.ui/**/*"
+
+
+
diff --git a/.travis.yml b/.travis.yml
index 631d384..2b80d4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
       - master
       - develop
 
-script: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify sonar:sonar
+script: mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent verify sonar:sonar -Dsonar.host.url=https://sonarcloud.io
 
 cache:
   directories:
diff --git a/README.md b/README.md
index 2b98cff..a1e77a9 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,33 @@
+
 # environment.monitor
 
+[![Build Status](https://travis-ci.org/YagelNasManit/environment.monitor.svg?branch=master)](https://travis-ci.org/YagelNasManit/environment.monitor) [![Code Climate](https://codeclimate.com/github/YagelNasManit/environment.monitor/badges/gpa.svg)](https://codeclimate.com/github/YagelNasManit/environment.monitor)
+
 Is a tool for continuous gathering, aggregation and representation of environment health, that provides access to environment status information via both UI dashboards & REST API
 
-For example this view and mutch more:
-![CURRENT STATUS DASHBOARD](https://raw.githubusercontent.com/wiki/YagelNasManit/environment.monitor/images/current_env_status_dashboard.png)
+Current environment components states | Environment components daily statistics  
+--- | --- 
+![CURRENT STATUS DASHBOARD](https://raw.githubusercontent.com/wiki/YagelNasManit/environment.monitor/images/2.0.0/current_env_status_dashboard.png) | ![ENVIRONMENT DAILY STATUS DASHBOARD](https://raw.githubusercontent.com/wiki/YagelNasManit/environment.monitor/images/2.0.0/env_daily_status_dashboard.png)
+
+Particular component availability over time |   
+--- |
+![RESOURCE DETAILS DASHBOARD](https://raw.githubusercontent.com/wiki/YagelNasManit/environment.monitor/images/2.0.0/resource_details_dashboard.png)| 
+
+
+
 
+## Quickstart
+- In progress for Release 2.0.0
 
-# Quickstart
-// todo :)
+## Documentation
+See the [Wiki](https://github.com/YagelNasManit/environment.monitor/wiki) for the available documentation
 
-# Current Functionality (1.0-SNAPSHOT)
-- current environments status dashboard
-- environment last 24h status dashboard
-- current environment status service
+## Feature Requests & Bugs
+Found a bug or would like to see a new feature implemented? Raise an issue in the [Issue Tracker](https://github.com/YagelNasManit/environment.monitor/issues)
 
+## Contributing
+Eager to fix a bug or introduce a new feature? Clone the repository and issue a pull request
 
 
-#add environment monitor artefacts repository with maven:
-```xml
-...
-<repositories>
-    <repository>
-        <id>Cybercat-mvn-repo</id>
-        <url>https://raw.github.com/YagelNasManit/environment.monitor/mvn-repo/</url>
-        <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-        </snapshots>
-    </repository>
-</repositories>
-...
-```
+## License
+environment.monitor is licensed under the [Apache License 2.0](https://github.com/YagelNasManit/environment.monitor/blob/master/LICENSE)
diff --git a/environment.monitor.core/pom.xml b/environment.monitor.core/pom.xml
index 67c9c66..55a4de2 100644
--- a/environment.monitor.core/pom.xml
+++ b/environment.monitor.core/pom.xml
@@ -27,10 +27,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.github.github</groupId>
-                <artifactId>site-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
             </plugin>
diff --git a/environment.monitor.plugins/pom.xml b/environment.monitor.plugins/pom.xml
index f082b64..888b5c1 100644
--- a/environment.monitor.plugins/pom.xml
+++ b/environment.monitor.plugins/pom.xml
@@ -36,10 +36,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.github.github</groupId>
-                <artifactId>site-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
             </plugin>
diff --git a/environment.monitor.runner/pom.xml b/environment.monitor.runner/pom.xml
index c54618a..4032bae 100644
--- a/environment.monitor.runner/pom.xml
+++ b/environment.monitor.runner/pom.xml
@@ -57,10 +57,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>com.github.github</groupId>
-                <artifactId>site-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <artifactId>maven-deploy-plugin</artifactId>
             </plugin>
diff --git a/environment.monitor.server/pom.xml b/environment.monitor.server/pom.xml
index e2eb017..af51124 100644
--- a/environment.monitor.server/pom.xml
+++ b/environment.monitor.server/pom.xml
@@ -38,10 +38,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -50,15 +46,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web-services</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>de.flapdoodle.embed</groupId>
             <artifactId>de.flapdoodle.embed.mongo</artifactId>
diff --git a/environment.monitor.test.extension/pom.xml b/environment.monitor.test.extension/pom.xml
index 2c18534..13aa866 100644
--- a/environment.monitor.test.extension/pom.xml
+++ b/environment.monitor.test.extension/pom.xml
@@ -15,6 +15,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <root.dir>${project.parent.basedir}</root.dir>
     </properties>
 
     <dependencies>
@@ -31,6 +32,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
         </plugins>
+
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 54efc8d..6d2eb51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>2.8.2</version>
                     <configuration>
-                        <altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo
+                        <altDeploymentRepository>internal.repo::default::file://${root.dir}/target/mvn-repo
                         </altDeploymentRepository>
                     </configuration>
                 </plugin>
@@ -79,11 +79,12 @@
                     <configuration>
                         <message>Uploaded environment.monitor artifacts for ${project.version}</message>
                         <dryRun>false</dryRun>
+                        <merge>true</merge>
                         <branch>refs/heads/mvn-repo</branch>
                         <server>github</server>
                         <repositoryName>environment.monitor</repositoryName>
                         <repositoryOwner>YagelNasManit</repositoryOwner>
-                        <outputDirectory>${project.build.directory}/mvn-repo</outputDirectory>
+                        <outputDirectory>${root.dir}/target/mvn-repo</outputDirectory>
                     </configuration>
                     <executions>
                         <execution>