diff --git a/base/src/main/java/de/staropensource/sosengine/base/Engine.java b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
index 1ea872c..d88ff62 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java
@@ -19,6 +19,7 @@
 
 package de.staropensource.sosengine.base;
 
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import de.staropensource.sosengine.base.logging.CrashHandler;
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/BuildInfo.java b/base/src/main/java/de/staropensource/sosengine/base/data/info/BuildInfo.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/utility/BuildInfo.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/info/BuildInfo.java
index 60fdf8c..46b5afb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/BuildInfo.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/info/BuildInfo.java
@@ -17,12 +17,13 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.utility;
+package de.staropensource.sosengine.base.data.info;
 
 import de.staropensource.sosengine.base.logging.LoggerInstance;
 import de.staropensource.sosengine.base.types.CodePart;
 import de.staropensource.sosengine.base.types.LogIssuer;
 import de.staropensource.sosengine.base.types.VersionType;
+import de.staropensource.sosengine.base.utility.PropertyParser;
 import lombok.Getter;
 
 import java.io.IOException;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/JvmInformation.java b/base/src/main/java/de/staropensource/sosengine/base/data/info/JvmInformation.java
similarity index 98%
rename from base/src/main/java/de/staropensource/sosengine/base/utility/JvmInformation.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/info/JvmInformation.java
index 7cd95a2..4026f52 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/JvmInformation.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/info/JvmInformation.java
@@ -17,7 +17,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.utility;
+package de.staropensource.sosengine.base.data.info;
 
 import java.lang.management.ManagementFactory;
 import java.util.List;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/info/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/data/info/package-info.java
new file mode 100644
index 0000000..d9eb21c
--- /dev/null
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/info/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Provides various classes that can be used to retrieve information about the engine or JVM.
+ */
+package de.staropensource.sosengine.base.data.info;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJansi.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJansi.java
index 5d93c3d..ea16524 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJansi.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJansi.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJetbrainsAnnotations.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJetbrainsAnnotations.java
index c40ac1c..ce9e4d3 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJetbrainsAnnotations.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJetbrainsAnnotations.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLombok.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLombok.java
index c866906..ecb19c1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLombok.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLombok.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginLombok.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginLombok.java
index e856dfa..b835f27 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginLombok.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginLombok.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginShadow.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginShadow.java
index 707f3eb..2b94238 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginShadow.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginShadow.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionFork.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionFork.java
index 059d1e0..3f5ccb1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionFork.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionFork.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionType.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionType.java
index 3be1596..9278a06 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionType.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionTyperelease.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionTyperelease.java
index e8ffcc0..1867620 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionTyperelease.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionTyperelease.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionVersion.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionVersion.java
index e9c8a73..7c07eba 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionVersion.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmArguments.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmArguments.java
index 4123d50..2bf1a52 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmArguments.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmArguments.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.JvmInformation;
+import de.staropensource.sosengine.base.data.info.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationName.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationName.java
index e1615bf..239f2b0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationName.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationName.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.JvmInformation;
+import de.staropensource.sosengine.base.data.info.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVendor.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVendor.java
index b0fcec1..9b60f90 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVendor.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVendor.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.JvmInformation;
+import de.staropensource.sosengine.base.data.info.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVersion.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVersion.java
index 7e5fd00..c284892 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVersion.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.JvmInformation;
+import de.staropensource.sosengine.base.data.info.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmJava.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmJava.java
index 522e13e..5a0c0e0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmJava.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmJava.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.JvmInformation;
+import de.staropensource.sosengine.base.data.info.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmUptime.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmUptime.java
index 746a80e..c0a8d2c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmUptime.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmUptime.java
@@ -20,7 +20,7 @@
 package de.staropensource.sosengine.base.data.placeholders;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
-import de.staropensource.sosengine.base.utility.JvmInformation;
+import de.staropensource.sosengine.base.data.info.JvmInformation;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java b/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
index 534f8ba..e75e37a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/types/VersionType.java
@@ -19,7 +19,7 @@
 
 package de.staropensource.sosengine.base.types;
 
-import de.staropensource.sosengine.base.utility.BuildInfo;
+import de.staropensource.sosengine.base.data.info.BuildInfo;
 
 /**
  * Provides all available version types.