diff --git a/README.md b/README.md
index f668469..e59346f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# System Monitor / System Observer
+# System Monitor
 
-... or some better name.
+Java based system monitoring solution with support for plugins.
 
 
 ## Client
diff --git a/build.gradle b/build.gradle
index 5197f53..711de51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,19 @@
 subprojects {
+
+    buildscript {
+        repositories {
+            maven { url("https://plugins.gradle.org/m2/") }
+        }
+        dependencies {
+            classpath 'org.redline-rpm:redline:1.2.9'
+        }
+    }
+
     apply plugin: 'java'
     apply plugin: 'groovy'
 
     dependencies {
-        testImplementation 'org.spockframework:spock-core:2.0-M5-groovy-3.0'
+        testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
         testImplementation "org.slf4j:slf4j-api:${slf4jVersion}"
 
         implementation "org.slf4j:slf4j-api:${slf4jVersion}"
diff --git a/client/build.gradle b/client/build.gradle
index 351a82f..1614d3e 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -32,7 +32,7 @@ def projectName = "sysmon-client"
 
 application {
     // Define the main class for the application.
-    mainClassName = 'org.sysmon.client.Application'
+    mainClass.set('sysmon.client.Application')
 }
 
 run {
diff --git a/client/src/main/java/org/sysmon/client/Application.java b/client/src/main/java/sysmon/client/Application.java
similarity index 96%
rename from client/src/main/java/org/sysmon/client/Application.java
rename to client/src/main/java/sysmon/client/Application.java
index 623375f..67a6d3a 100644
--- a/client/src/main/java/org/sysmon/client/Application.java
+++ b/client/src/main/java/sysmon/client/Application.java
@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package org.sysmon.client;
+package sysmon.client;
 
 import org.apache.camel.main.Main;
 import org.slf4j.Logger;
@@ -12,8 +12,6 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.concurrent.Callable;
 
 @CommandLine.Command(name = "sysmon-client", mixinStandardHelpOptions = true)
diff --git a/client/src/main/java/org/sysmon/client/ClientRouteBuilder.java b/client/src/main/java/sysmon/client/ClientRouteBuilder.java
similarity index 96%
rename from client/src/main/java/org/sysmon/client/ClientRouteBuilder.java
rename to client/src/main/java/sysmon/client/ClientRouteBuilder.java
index 93deaad..b339cef 100644
--- a/client/src/main/java/org/sysmon/client/ClientRouteBuilder.java
+++ b/client/src/main/java/sysmon/client/ClientRouteBuilder.java
@@ -1,4 +1,4 @@
-package org.sysmon.client;
+package sysmon.client;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
@@ -8,8 +8,8 @@ import org.pf4j.JarPluginManager;
 import org.pf4j.PluginManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.MetricExtension;
-import org.sysmon.shared.MetricResult;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/client/src/main/java/org/sysmon/client/MetricEnrichProcessor.java b/client/src/main/java/sysmon/client/MetricEnrichProcessor.java
similarity index 93%
rename from client/src/main/java/org/sysmon/client/MetricEnrichProcessor.java
rename to client/src/main/java/sysmon/client/MetricEnrichProcessor.java
index 97cf4a5..0ce6004 100644
--- a/client/src/main/java/org/sysmon/client/MetricEnrichProcessor.java
+++ b/client/src/main/java/sysmon/client/MetricEnrichProcessor.java
@@ -1,9 +1,9 @@
-package org.sysmon.client;
+package sysmon.client;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.spi.Registry;
-import org.sysmon.shared.MetricResult;
+import sysmon.shared.MetricResult;
 
 
 public class MetricEnrichProcessor implements Processor {
diff --git a/client/src/test/groovy/org/sysmon/client/AppTest.groovy b/client/src/test/groovy/sysmon/client/AppTest.groovy
similarity index 70%
rename from client/src/test/groovy/org/sysmon/client/AppTest.groovy
rename to client/src/test/groovy/sysmon/client/AppTest.groovy
index 78e8dd8..3652b6a 100644
--- a/client/src/test/groovy/org/sysmon/client/AppTest.groovy
+++ b/client/src/test/groovy/sysmon/client/AppTest.groovy
@@ -1,9 +1,7 @@
-package org.sysmon.client
+package sysmon.client
 
 import spock.lang.Specification
 
 class AppTest extends Specification {
 
-   
-
 }
diff --git a/gradle.properties b/gradle.properties
index 7431dd5..c19484a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,4 @@
-group=org.sysmon
 version=0.0.1-SNAPSHOT
-
 pf4jVersion=3.6.0
 slf4jVersion=1.7.30
 camelVersion=3.7.4
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643..0f80bbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/plugins/build.gradle b/plugins/build.gradle
index b9f9cad..7dd8719 100644
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@@ -10,7 +10,7 @@ subprojects {
     apply plugin: 'groovy'
 
     dependencies {
-        testImplementation 'org.spockframework:spock-core:2.0-M5-groovy-3.0'
+        testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
         testImplementation "org.slf4j:slf4j-api:${slf4jVersion}"
         testImplementation project(':shared')
 
diff --git a/plugins/sysmon-aix/README.md b/plugins/os-aix/README.md
similarity index 100%
rename from plugins/sysmon-aix/README.md
rename to plugins/os-aix/README.md
diff --git a/plugins/sysmon-aix/build.gradle b/plugins/os-aix/build.gradle
similarity index 100%
rename from plugins/sysmon-aix/build.gradle
rename to plugins/os-aix/build.gradle
diff --git a/plugins/os-aix/gradle.properties b/plugins/os-aix/gradle.properties
new file mode 100644
index 0000000..300c5af
--- /dev/null
+++ b/plugins/os-aix/gradle.properties
@@ -0,0 +1,6 @@
+pluginId=sysmon-aix
+pluginClass=sysmon.plugins.os_aix.AixPlugin
+pluginVersion=0.0.1
+pluginProvider=System Monitor
+pluginDependencies=
+pluginDescription=Collects AIX OS metrics.
\ No newline at end of file
diff --git a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixDiskExtension.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixDiskExtension.java
similarity index 87%
rename from plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixDiskExtension.java
rename to plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixDiskExtension.java
index 81707c3..519fc0a 100644
--- a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixDiskExtension.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixDiskExtension.java
@@ -1,12 +1,12 @@
-package org.sysmon.plugins.sysmon_aix;
+package sysmon.plugins.os_aix;
 
 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.Measurement;
-import org.sysmon.shared.MetricExtension;
-import org.sysmon.shared.MetricResult;
-import org.sysmon.shared.PluginHelper;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+import sysmon.shared.PluginHelper;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixDiskStat.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixDiskStat.java
similarity index 91%
rename from plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixDiskStat.java
rename to plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixDiskStat.java
index f0a62be..fd1643c 100644
--- a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixDiskStat.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixDiskStat.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_aix;
+package sysmon.plugins.os_aix;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,8 +22,8 @@ public class AixDiskStat {
     //private Float tmAct = 0.0f;     // Indicates the percentage of time the physical disk/tape was active (bandwidth utilization for the drive).
     private Float kbps = 0.0f;      // Indicates the amount of data transferred (read or written) to the drive in KB per second.
     private Float tps = 0.0f;       // Indicates the number of transfers per second that were issued to the physical disk/tape. A transfer is an I/O request to the physical disk/tape. Multiple logical requests can be combined into a single I/O request to the disk. A transfer is of indeterminate size.
-    private Long kbRead = 0l;       // The total number of KB read.
-    private Long kbWritten = 0l;    // The total number of KB written.
+    private Long kbRead = 0L;       // The total number of KB read.
+    private Long kbWritten = 0L;    // The total number of KB written.
 
 
     AixDiskStat(List<String> lines) {
@@ -56,6 +56,8 @@ public class AixDiskStat {
         Map<String, Object> fields = new HashMap<>();
         fields.put("reads", kbRead * 1024);     // from Kb to bytes
         fields.put("writes", kbWritten * 1024); // from Kb to bytes
+        fields.put("kbps", kbps);
+        fields.put("tps", tps);
         return fields;
     }
 }
diff --git a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixMemoryExtension.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixMemoryExtension.java
similarity index 88%
rename from plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixMemoryExtension.java
rename to plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixMemoryExtension.java
index b47936d..89ad1fb 100644
--- a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixMemoryExtension.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixMemoryExtension.java
@@ -1,12 +1,12 @@
-package org.sysmon.plugins.sysmon_aix;
+package sysmon.plugins.os_aix;
 
 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.Measurement;
-import org.sysmon.shared.MetricExtension;
-import org.sysmon.shared.MetricResult;
-import org.sysmon.shared.PluginHelper;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+import sysmon.shared.PluginHelper;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixMemoryStat.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixMemoryStat.java
similarity index 98%
rename from plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixMemoryStat.java
rename to plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixMemoryStat.java
index b517d92..0a97e68 100644
--- a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixMemoryStat.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixMemoryStat.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_aix;
+package sysmon.plugins.os_aix;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixPlugin.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixPlugin.java
similarity index 89%
rename from plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixPlugin.java
rename to plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixPlugin.java
index 11f279d..1469eb3 100644
--- a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixPlugin.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixPlugin.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_aix;
+package sysmon.plugins.os_aix;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixProcessorExtension.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorExtension.java
similarity index 88%
rename from plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixProcessorExtension.java
rename to plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorExtension.java
index 4d37676..b0fd8c4 100644
--- a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixProcessorExtension.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorExtension.java
@@ -1,12 +1,12 @@
-package org.sysmon.plugins.sysmon_aix;
+package sysmon.plugins.os_aix;
 
 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.Measurement;
-import org.sysmon.shared.MetricExtension;
-import org.sysmon.shared.MetricResult;
-import org.sysmon.shared.PluginHelper;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+import sysmon.shared.PluginHelper;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixProcessorStat.java b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java
similarity index 97%
rename from plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixProcessorStat.java
rename to plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java
index 0e037b1..f599855 100644
--- a/plugins/sysmon-aix/src/main/java/org/sysmon/plugins/sysmon_aix/AixProcessorStat.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_aix;
+package sysmon.plugins.os_aix;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -118,8 +118,6 @@ public class AixProcessorStat {
 
     public Map<String, String> getTags() {
         Map<String, String> tags = new HashMap<>();
-        tags.put("mode", mode);
-        tags.put("type", type);
         return tags;
     }
 
@@ -134,7 +132,8 @@ public class AixProcessorStat {
         fields.put("physc", physc);
         fields.put("entc", entc);
         fields.put("lbusy", lbusy);
-
+        fields.put("mode", mode);
+        fields.put("type", type);
         return fields;
     }
 }
diff --git a/plugins/sysmon-aix/src/test/groovy/AixDiskTest.groovy b/plugins/os-aix/src/test/groovy/AixDiskTest.groovy
similarity index 63%
rename from plugins/sysmon-aix/src/test/groovy/AixDiskTest.groovy
rename to plugins/os-aix/src/test/groovy/AixDiskTest.groovy
index 51b628e..c77e5e9 100644
--- a/plugins/sysmon-aix/src/test/groovy/AixDiskTest.groovy
+++ b/plugins/os-aix/src/test/groovy/AixDiskTest.groovy
@@ -1,5 +1,5 @@
-import org.sysmon.plugins.sysmon_aix.AixDiskExtension
-import org.sysmon.plugins.sysmon_aix.AixDiskStat
+import sysmon.plugins.os_aix.AixDiskExtension
+import sysmon.plugins.os_aix.AixDiskStat
 import spock.lang.Specification
 
 class AixDiskTest extends Specification {
@@ -16,8 +16,10 @@ class AixDiskTest extends Specification {
 
         then:
         //stats.getTags().get("device") == "hdisk0"
-        stats.getFields().get("reads") == 757760l
-        stats.getFields().get("writes") == 12288l
+        stats.getFields().get("reads") == 757760L
+        stats.getFields().get("writes") == 12288L
+        stats.getFields().get("kbps") == 752.0F
+        stats.getFields().get("tps") == 81.0F
 
     }
 
diff --git a/plugins/sysmon-aix/src/test/groovy/AixMemoryTest.groovy b/plugins/os-aix/src/test/groovy/AixMemoryTest.groovy
similarity index 88%
rename from plugins/sysmon-aix/src/test/groovy/AixMemoryTest.groovy
rename to plugins/os-aix/src/test/groovy/AixMemoryTest.groovy
index ffa9a76..6ee3b9d 100644
--- a/plugins/sysmon-aix/src/test/groovy/AixMemoryTest.groovy
+++ b/plugins/os-aix/src/test/groovy/AixMemoryTest.groovy
@@ -1,5 +1,5 @@
-import org.sysmon.plugins.sysmon_aix.AixMemoryExtension
-import org.sysmon.plugins.sysmon_aix.AixMemoryStat
+import sysmon.plugins.os_aix.AixMemoryExtension
+import sysmon.plugins.os_aix.AixMemoryStat
 import spock.lang.Specification
 
 class AixMemoryTest extends Specification {
diff --git a/plugins/sysmon-aix/src/test/groovy/AixProcessorTest.groovy b/plugins/os-aix/src/test/groovy/AixProcessorTest.groovy
similarity index 85%
rename from plugins/sysmon-aix/src/test/groovy/AixProcessorTest.groovy
rename to plugins/os-aix/src/test/groovy/AixProcessorTest.groovy
index a0d9f95..dd481b1 100644
--- a/plugins/sysmon-aix/src/test/groovy/AixProcessorTest.groovy
+++ b/plugins/os-aix/src/test/groovy/AixProcessorTest.groovy
@@ -1,5 +1,5 @@
-import org.sysmon.plugins.sysmon_aix.AixProcessorExtension
-import org.sysmon.plugins.sysmon_aix.AixProcessorStat
+import sysmon.plugins.os_aix.AixProcessorExtension
+import sysmon.plugins.os_aix.AixProcessorStat
 import spock.lang.Specification
 
 class AixProcessorTest extends Specification {
@@ -40,8 +40,8 @@ class AixProcessorTest extends Specification {
         stats.getWait() == 0.0f
         stats.getIdle() == 99.97f
         stats.getFields().get("ent") == 4.00f
-        stats.getTags().get("mode") == "Uncapped"
-        stats.getTags().get("type") == "Shared"
+        stats.getFields().get("mode") == "Uncapped"
+        stats.getFields().get("type") == "Shared"
 
     }
 
diff --git a/plugins/sysmon-aix/src/test/resources/iostat.txt b/plugins/os-aix/src/test/resources/iostat.txt
similarity index 100%
rename from plugins/sysmon-aix/src/test/resources/iostat.txt
rename to plugins/os-aix/src/test/resources/iostat.txt
diff --git a/plugins/sysmon-aix/src/test/resources/lparstat-aix.txt b/plugins/os-aix/src/test/resources/lparstat-aix.txt
similarity index 100%
rename from plugins/sysmon-aix/src/test/resources/lparstat-aix.txt
rename to plugins/os-aix/src/test/resources/lparstat-aix.txt
diff --git a/plugins/sysmon-aix/src/test/resources/lparstat-linux.txt b/plugins/os-aix/src/test/resources/lparstat-linux.txt
similarity index 100%
rename from plugins/sysmon-aix/src/test/resources/lparstat-linux.txt
rename to plugins/os-aix/src/test/resources/lparstat-linux.txt
diff --git a/plugins/sysmon-aix/src/test/resources/mpstat-v.txt b/plugins/os-aix/src/test/resources/mpstat-v.txt
similarity index 100%
rename from plugins/sysmon-aix/src/test/resources/mpstat-v.txt
rename to plugins/os-aix/src/test/resources/mpstat-v.txt
diff --git a/plugins/sysmon-aix/src/test/resources/svmon.txt b/plugins/os-aix/src/test/resources/svmon.txt
similarity index 100%
rename from plugins/sysmon-aix/src/test/resources/svmon.txt
rename to plugins/os-aix/src/test/resources/svmon.txt
diff --git a/plugins/sysmon-aix/src/test/resources/vmstat-Iwt.txt b/plugins/os-aix/src/test/resources/vmstat-Iwt.txt
similarity index 100%
rename from plugins/sysmon-aix/src/test/resources/vmstat-Iwt.txt
rename to plugins/os-aix/src/test/resources/vmstat-Iwt.txt
diff --git a/plugins/sysmon-linux/README.md b/plugins/os-linux/README.md
similarity index 100%
rename from plugins/sysmon-linux/README.md
rename to plugins/os-linux/README.md
diff --git a/plugins/sysmon-linux/build.gradle b/plugins/os-linux/build.gradle
similarity index 100%
rename from plugins/sysmon-linux/build.gradle
rename to plugins/os-linux/build.gradle
diff --git a/plugins/sysmon-linux/gradle.properties b/plugins/os-linux/gradle.properties
similarity index 71%
rename from plugins/sysmon-linux/gradle.properties
rename to plugins/os-linux/gradle.properties
index 8889e50..3a97f32 100644
--- a/plugins/sysmon-linux/gradle.properties
+++ b/plugins/os-linux/gradle.properties
@@ -1,5 +1,5 @@
 pluginId=sysmon-linux
-pluginClass=org.sysmon.plugins.sysmon_linux.LinuxPlugin
+pluginClass=sysmon.plugins.os_linux.LinuxPlugin
 pluginVersion=0.0.1
 pluginProvider=System Monitor
 pluginDependencies=
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskExtension.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskExtension.java
similarity index 93%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskExtension.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskExtension.java
index 7e9d8a7..c46d237 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskExtension.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskExtension.java
@@ -1,11 +1,11 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.Measurement;
-import org.sysmon.shared.MetricExtension;
-import org.sysmon.shared.MetricResult;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskProcLine.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskProcLine.java
similarity index 73%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskProcLine.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskProcLine.java
index 0f45380..18d859d 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskProcLine.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskProcLine.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,25 +49,25 @@ public class LinuxDiskProcLine {
 		==  =====================================
     */
 
-    private Long readsCompleted = 0l;          // successfully
-    private Long readsMerged = 0l;
-    private Long sectorsRead = 0l;             // 512 bytes pr. sector
-    private Long timeSpentReading = 0l;        // ms
-    private Long writesCompleted = 0l;         // successfully
-    private Long writesMerged = 0l;
-    private Long sectorsWritten = 0l;          // 512 bytes pr. sector
-    private Long timeSpentWriting = 0l;        // ms
-    private Long ioInProgress = 0l;
-    private Long timeSpentOnIo = 0l;           // ms
-    private Long timeSpentOnIoWeighted = 0l;
+    private Long readsCompleted = 0L;          // successfully
+    //private Long readsMerged = 0L;
+    private Long sectorsRead = 0L;             // 512 bytes pr. sector
+    private Long timeSpentReading = 0L;        // ms
+    private Long writesCompleted = 0L;         // successfully
+    //private Long writesMerged = 0L;
+    private Long sectorsWritten = 0L;          // 512 bytes pr. sector
+    private Long timeSpentWriting = 0L;        // ms
+    //private Long ioInProgress = 0L;
+    private Long timeSpentOnIo = 0L;           // ms
+    //private Long timeSpentOnIoWeighted = 0L;
 
-    private Long discardsCompleted = 0l;       // successfully
-    private Long discardsMerged = 0l;
-    private Long sectorsDiscarded = 0l;        // 512 bytes pr. sector
-    private Long timeSpentDiscarding = 0l;     // ms
+    //private Long discardsCompleted = 0L;       // successfully
+    //private Long discardsMerged = 0L;
+    //private Long sectorsDiscarded = 0L;        // 512 bytes pr. sector
+    //private Long timeSpentDiscarding = 0L;     // ms
 
-    private Long flushRequestsCompleted = 0l;
-    private Long timeSpentFlushing = 0l;       // ms
+    //private Long flushRequestsCompleted = 0L;
+    //private Long timeSpentFlushing = 0L;       // ms
 
 
     LinuxDiskProcLine(List<String> procLines) {
@@ -83,17 +83,18 @@ public class LinuxDiskProcLine {
             //this.minor = Integer.parseInt(splitStr[1]);
             //this.device = splitStr[2];
             this.readsCompleted += Long.parseLong(splitStr[3]);
-            this.readsMerged += Long.parseLong(splitStr[4]);
+            //this.readsMerged += Long.parseLong(splitStr[4]);
             this.sectorsRead += Long.parseLong(splitStr[5]);
             this.timeSpentReading += Long.parseLong(splitStr[6]);
             this.writesCompleted += Long.parseLong(splitStr[7]);
-            this.writesMerged += Long.parseLong(splitStr[8]);
+            //this.writesMerged += Long.parseLong(splitStr[8]);
             this.sectorsWritten += Long.parseLong(splitStr[9]);
             this.timeSpentWriting += Long.parseLong(splitStr[10]);
-            this.ioInProgress += Long.parseLong(splitStr[11]);
+            //this.ioInProgress += Long.parseLong(splitStr[11]);
             this.timeSpentOnIo += Long.parseLong(splitStr[12]);
-            this.timeSpentOnIoWeighted += Long.parseLong(splitStr[13]);
+            //this.timeSpentOnIoWeighted += Long.parseLong(splitStr[13]);
 
+            /*
             if (splitStr.length >= 18) {
                 this.discardsCompleted += Long.parseLong(splitStr[10]);
                 this.discardsMerged += Long.parseLong(splitStr[11]);
@@ -113,6 +114,8 @@ public class LinuxDiskProcLine {
                 this.flushRequestsCompleted = null;
                 this.timeSpentFlushing = null;
             }
+             */
+
         }
     }
 
@@ -136,4 +139,8 @@ public class LinuxDiskProcLine {
         return timeSpentWriting;
     }
 
+    public Long getTransactions() {
+        return readsCompleted + writesCompleted;
+    }
+
 }
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskStat.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskStat.java
similarity index 70%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskStat.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskStat.java
index 9bdd12d..c35263c 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxDiskStat.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxDiskStat.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,18 +11,18 @@ public class LinuxDiskStat {
     private static final Logger log = LoggerFactory.getLogger(LinuxDiskStat.class);
 
     private String device;
-    private Long iotime;
-    private Long reads;
-    private Long writes;
-    private Long readTime;
-    private Long writeTime;
+    private final long iotime;
+    private final long reads;
+    private final long writes;
+    private final double kbps;
+    private final double tps;
 
     LinuxDiskStat(LinuxDiskProcLine proc1, LinuxDiskProcLine proc2) {
-
         iotime = proc2.getTimeSpentOnIo() - proc1.getTimeSpentOnIo();
         writes = proc2.getBytesWritten() - proc1.getBytesWritten();
         reads = proc2.getBytesRead() - proc1.getBytesRead();
-
+        kbps = ((double) writes + reads) / 1024;
+        tps = proc2.getTransactions() - proc1.getTransactions();
     }
 
     public Map<String, String> getTags() {
@@ -35,6 +35,8 @@ public class LinuxDiskStat {
         fields.put("iotime", iotime);
         fields.put("writes", writes);
         fields.put("reads", reads);
+        fields.put("kbps", kbps);
+        fields.put("tps", tps);
         return fields;
     }
 }
\ No newline at end of file
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxMemoryExtension.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxMemoryExtension.java
similarity index 88%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxMemoryExtension.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxMemoryExtension.java
index d69bf7f..5995879 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxMemoryExtension.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxMemoryExtension.java
@@ -1,12 +1,12 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.Measurement;
-import org.sysmon.shared.MetricExtension;
-import org.sysmon.shared.MetricResult;
-import org.sysmon.shared.PluginHelper;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+import sysmon.shared.PluginHelper;
 
 import java.util.List;
 import java.util.Map;
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxMemoryStat.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxMemoryStat.java
similarity index 98%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxMemoryStat.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxMemoryStat.java
index 2a8f300..c4653e9 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxMemoryStat.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxMemoryStat.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxPlugin.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxPlugin.java
similarity index 88%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxPlugin.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxPlugin.java
index 515156b..d124e00 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxPlugin.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxPlugin.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorExtension.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorExtension.java
similarity index 91%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorExtension.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorExtension.java
index 58a2c72..cf7cee0 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorExtension.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorExtension.java
@@ -1,20 +1,18 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.Measurement;
-import org.sysmon.shared.MetricExtension;
-import org.sysmon.shared.MetricResult;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 @Extension
 public class LinuxProcessorExtension implements MetricExtension {
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorProcLine.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorProcLine.java
similarity index 98%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorProcLine.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorProcLine.java
index 05a3522..d5d6be3 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorProcLine.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorProcLine.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 public class LinuxProcessorProcLine {
 
diff --git a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorStat.java b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorStat.java
similarity index 97%
rename from plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorStat.java
rename to plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorStat.java
index f051ed3..8b9947e 100644
--- a/plugins/sysmon-linux/src/main/java/org/sysmon/plugins/sysmon_linux/LinuxProcessorStat.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxProcessorStat.java
@@ -1,4 +1,4 @@
-package org.sysmon.plugins.sysmon_linux;
+package sysmon.plugins.os_linux;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/plugins/sysmon-linux/src/test/groovy/LinuxDiskTest.groovy b/plugins/os-linux/src/test/groovy/LinuxDiskTest.groovy
similarity index 72%
rename from plugins/sysmon-linux/src/test/groovy/LinuxDiskTest.groovy
rename to plugins/os-linux/src/test/groovy/LinuxDiskTest.groovy
index 1fb550b..f803ccd 100644
--- a/plugins/sysmon-linux/src/test/groovy/LinuxDiskTest.groovy
+++ b/plugins/os-linux/src/test/groovy/LinuxDiskTest.groovy
@@ -1,6 +1,6 @@
-import org.sysmon.plugins.sysmon_linux.LinuxDiskExtension
-import org.sysmon.plugins.sysmon_linux.LinuxDiskProcLine
-import org.sysmon.plugins.sysmon_linux.LinuxDiskStat
+import sysmon.plugins.os_linux.LinuxDiskExtension
+import sysmon.plugins.os_linux.LinuxDiskProcLine
+import sysmon.plugins.os_linux.LinuxDiskStat
 import spock.lang.Specification
 
 class LinuxDiskTest extends Specification {
@@ -33,9 +33,11 @@ class LinuxDiskTest extends Specification {
         LinuxDiskStat diskStat = new LinuxDiskStat(procLine1, procLine2)
 
         then:
-        diskStat.getFields().get("iotime") == 180l
-        diskStat.getFields().get("writes") == 108371968l
-        diskStat.getFields().get("reads") == 69632l
+        diskStat.getFields().get("iotime") == 180L
+        diskStat.getFields().get("writes") == 108371968L
+        diskStat.getFields().get("reads") == 69632L
+        diskStat.getFields().get("kbps") == 105900.0f
+        diskStat.getFields().get("tps") == 97.0f
 
     }
 }
diff --git a/plugins/sysmon-linux/src/test/groovy/LinuxMemoryTest.groovy b/plugins/os-linux/src/test/groovy/LinuxMemoryTest.groovy
similarity index 87%
rename from plugins/sysmon-linux/src/test/groovy/LinuxMemoryTest.groovy
rename to plugins/os-linux/src/test/groovy/LinuxMemoryTest.groovy
index 0778ff7..b1b8dcb 100644
--- a/plugins/sysmon-linux/src/test/groovy/LinuxMemoryTest.groovy
+++ b/plugins/os-linux/src/test/groovy/LinuxMemoryTest.groovy
@@ -1,5 +1,5 @@
-import org.sysmon.plugins.sysmon_linux.LinuxMemoryExtension
-import org.sysmon.plugins.sysmon_linux.LinuxMemoryStat
+import sysmon.plugins.os_linux.LinuxMemoryExtension
+import sysmon.plugins.os_linux.LinuxMemoryStat
 import spock.lang.Specification
 
 class LinuxMemoryTest extends Specification {
diff --git a/plugins/sysmon-linux/src/test/groovy/LinuxProcessorTest.groovy b/plugins/os-linux/src/test/groovy/LinuxProcessorTest.groovy
similarity index 89%
rename from plugins/sysmon-linux/src/test/groovy/LinuxProcessorTest.groovy
rename to plugins/os-linux/src/test/groovy/LinuxProcessorTest.groovy
index 95a0afe..9577a31 100644
--- a/plugins/sysmon-linux/src/test/groovy/LinuxProcessorTest.groovy
+++ b/plugins/os-linux/src/test/groovy/LinuxProcessorTest.groovy
@@ -1,6 +1,6 @@
-import org.sysmon.plugins.sysmon_linux.LinuxProcessorExtension
-import org.sysmon.plugins.sysmon_linux.LinuxProcessorProcLine
-import org.sysmon.plugins.sysmon_linux.LinuxProcessorStat
+import sysmon.plugins.os_linux.LinuxProcessorExtension
+import sysmon.plugins.os_linux.LinuxProcessorProcLine
+import sysmon.plugins.os_linux.LinuxProcessorStat
 import spock.lang.Specification
 
 class LinuxProcessorTest extends Specification {
diff --git a/plugins/sysmon-linux/src/test/resources/diskstats1.txt b/plugins/os-linux/src/test/resources/diskstats1.txt
similarity index 100%
rename from plugins/sysmon-linux/src/test/resources/diskstats1.txt
rename to plugins/os-linux/src/test/resources/diskstats1.txt
diff --git a/plugins/sysmon-linux/src/test/resources/diskstats2.txt b/plugins/os-linux/src/test/resources/diskstats2.txt
similarity index 100%
rename from plugins/sysmon-linux/src/test/resources/diskstats2.txt
rename to plugins/os-linux/src/test/resources/diskstats2.txt
diff --git a/plugins/sysmon-linux/src/test/resources/free.txt b/plugins/os-linux/src/test/resources/free.txt
similarity index 100%
rename from plugins/sysmon-linux/src/test/resources/free.txt
rename to plugins/os-linux/src/test/resources/free.txt
diff --git a/plugins/sysmon-linux/src/test/resources/meminfo.txt b/plugins/os-linux/src/test/resources/meminfo.txt
similarity index 100%
rename from plugins/sysmon-linux/src/test/resources/meminfo.txt
rename to plugins/os-linux/src/test/resources/meminfo.txt
diff --git a/plugins/sysmon-linux/src/test/resources/proc1.txt b/plugins/os-linux/src/test/resources/proc1.txt
similarity index 100%
rename from plugins/sysmon-linux/src/test/resources/proc1.txt
rename to plugins/os-linux/src/test/resources/proc1.txt
diff --git a/plugins/sysmon-linux/src/test/resources/proc2.txt b/plugins/os-linux/src/test/resources/proc2.txt
similarity index 100%
rename from plugins/sysmon-linux/src/test/resources/proc2.txt
rename to plugins/os-linux/src/test/resources/proc2.txt
diff --git a/plugins/sysmon-aix/gradle.properties b/plugins/sysmon-aix/gradle.properties
deleted file mode 100644
index 46a90ea..0000000
--- a/plugins/sysmon-aix/gradle.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-pluginId=sysmon-aix
-pluginClass=org.sysmon.plugins.sysmon_aix.AixPlugin
-pluginVersion=0.0.1
-pluginProvider=System Monitor
-pluginDependencies=
-pluginDescription=Collects AIX OS metrics.
\ No newline at end of file
diff --git a/server/build.gradle b/server/build.gradle
index a7a5c27..2d2c92a 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -28,7 +28,7 @@ def projectName = "sysmon-server"
 
 application {
     // Define the main class for the application.
-    mainClassName = 'org.sysmon.server.Application'
+    mainClass.set('sysmon.server.Application')
 }
 
 tasks.named('test') {
diff --git a/server/src/main/java/org/sysmon/server/Application.java b/server/src/main/java/sysmon/server/Application.java
similarity index 93%
rename from server/src/main/java/org/sysmon/server/Application.java
rename to server/src/main/java/sysmon/server/Application.java
index 159c776..1ff0273 100644
--- a/server/src/main/java/org/sysmon/server/Application.java
+++ b/server/src/main/java/sysmon/server/Application.java
@@ -1,9 +1,6 @@
-package org.sysmon.server;
+package sysmon.server;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.main.Main;
-import org.apache.camel.support.DefaultRegistry;
-import org.apache.camel.support.SimpleRegistry;
 import org.influxdb.InfluxDB;
 import org.influxdb.InfluxDBFactory;
 import picocli.CommandLine;
diff --git a/server/src/main/java/org/sysmon/server/MetricResultToPointProcessor.java b/server/src/main/java/sysmon/server/MetricResultToPointProcessor.java
similarity index 91%
rename from server/src/main/java/org/sysmon/server/MetricResultToPointProcessor.java
rename to server/src/main/java/sysmon/server/MetricResultToPointProcessor.java
index 26e21d8..26eff05 100644
--- a/server/src/main/java/org/sysmon/server/MetricResultToPointProcessor.java
+++ b/server/src/main/java/sysmon/server/MetricResultToPointProcessor.java
@@ -1,15 +1,13 @@
-package org.sysmon.server;
+package sysmon.server;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.influxdb.dto.BatchPoints;
 import org.influxdb.dto.Point;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.sysmon.shared.Measurement;
-import org.sysmon.shared.MetricResult;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricResult;
 
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
diff --git a/server/src/main/java/org/sysmon/server/ServerRouteBuilder.java b/server/src/main/java/sysmon/server/ServerRouteBuilder.java
similarity index 94%
rename from server/src/main/java/org/sysmon/server/ServerRouteBuilder.java
rename to server/src/main/java/sysmon/server/ServerRouteBuilder.java
index d98831e..d80d032 100644
--- a/server/src/main/java/org/sysmon/server/ServerRouteBuilder.java
+++ b/server/src/main/java/sysmon/server/ServerRouteBuilder.java
@@ -1,12 +1,10 @@
-package org.sysmon.server;
+package sysmon.server;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.model.rest.RestBindingMode;
 import org.apache.camel.spi.Registry;
-import org.sysmon.shared.MetricResult;
-
-import java.util.Properties;
+import sysmon.shared.MetricResult;
 
 public class ServerRouteBuilder extends RouteBuilder {
 
diff --git a/server/src/main/java/org/sysmon/server/bean/Hello.java b/server/src/main/java/sysmon/server/bean/Hello.java
similarity index 94%
rename from server/src/main/java/org/sysmon/server/bean/Hello.java
rename to server/src/main/java/sysmon/server/bean/Hello.java
index a27a1f7..50f450c 100644
--- a/server/src/main/java/org/sysmon/server/bean/Hello.java
+++ b/server/src/main/java/sysmon/server/bean/Hello.java
@@ -1,4 +1,4 @@
-package org.sysmon.server.bean;
+package sysmon.server.bean;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/server/src/main/java/org/sysmon/server/bean/IncomingMetricProcessor.java b/server/src/main/java/sysmon/server/bean/IncomingMetricProcessor.java
similarity index 85%
rename from server/src/main/java/org/sysmon/server/bean/IncomingMetricProcessor.java
rename to server/src/main/java/sysmon/server/bean/IncomingMetricProcessor.java
index 2b40de2..82e3f4b 100644
--- a/server/src/main/java/org/sysmon/server/bean/IncomingMetricProcessor.java
+++ b/server/src/main/java/sysmon/server/bean/IncomingMetricProcessor.java
@@ -1,8 +1,8 @@
-package org.sysmon.server.bean;
+package sysmon.server.bean;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.sysmon.shared.MetricResult;
+import sysmon.shared.MetricResult;
 
 public class IncomingMetricProcessor implements Processor {
 
diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties
index cc7923e..c6e2b8f 100644
--- a/server/src/main/resources/application.properties
+++ b/server/src/main/resources/application.properties
@@ -39,5 +39,5 @@ camel.main.lightweight = true
 # camel.main.auto-startup = false
 
 # configure beans
-#camel.beans.incomingMetricProcessor = #class:org.sysmon.server.bean.IncomingMetricProcessor
-#camel.beans.hello = #class:org.sysmon.server.bean.Hello
+#camel.beans.incomingMetricProcessor = #class:IncomingMetricProcessor
+#camel.beans.hello = #class:Hello
diff --git a/shared/src/main/java/org/sysmon/shared/Measurement.java b/shared/src/main/java/sysmon/shared/Measurement.java
similarity index 96%
rename from shared/src/main/java/org/sysmon/shared/Measurement.java
rename to shared/src/main/java/sysmon/shared/Measurement.java
index 0e749d8..35ce34d 100644
--- a/shared/src/main/java/org/sysmon/shared/Measurement.java
+++ b/shared/src/main/java/sysmon/shared/Measurement.java
@@ -1,4 +1,4 @@
-package org.sysmon.shared;
+package sysmon.shared;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/shared/src/main/java/org/sysmon/shared/MetricExtension.java b/shared/src/main/java/sysmon/shared/MetricExtension.java
similarity index 89%
rename from shared/src/main/java/org/sysmon/shared/MetricExtension.java
rename to shared/src/main/java/sysmon/shared/MetricExtension.java
index ed525bc..bf00944 100644
--- a/shared/src/main/java/org/sysmon/shared/MetricExtension.java
+++ b/shared/src/main/java/sysmon/shared/MetricExtension.java
@@ -1,4 +1,4 @@
-package org.sysmon.shared;
+package sysmon.shared;
 
 import org.pf4j.ExtensionPoint;
 
diff --git a/shared/src/main/java/org/sysmon/shared/MetricResult.java b/shared/src/main/java/sysmon/shared/MetricResult.java
similarity index 98%
rename from shared/src/main/java/org/sysmon/shared/MetricResult.java
rename to shared/src/main/java/sysmon/shared/MetricResult.java
index 028c1ab..14bce96 100644
--- a/shared/src/main/java/org/sysmon/shared/MetricResult.java
+++ b/shared/src/main/java/sysmon/shared/MetricResult.java
@@ -1,4 +1,4 @@
-package org.sysmon.shared;
+package sysmon.shared;
 
 import java.io.Serializable;
 import java.time.Instant;
diff --git a/shared/src/main/java/org/sysmon/shared/PluginHelper.java b/shared/src/main/java/sysmon/shared/PluginHelper.java
similarity index 98%
rename from shared/src/main/java/org/sysmon/shared/PluginHelper.java
rename to shared/src/main/java/sysmon/shared/PluginHelper.java
index 2213792..984fc3f 100644
--- a/shared/src/main/java/org/sysmon/shared/PluginHelper.java
+++ b/shared/src/main/java/sysmon/shared/PluginHelper.java
@@ -1,4 +1,4 @@
-package org.sysmon.shared;
+package sysmon.shared;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;