diff --git a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
index 36219b7..3249131 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/EngineConfiguration.java
@@ -149,7 +149,7 @@ public final class EngineConfiguration implements SubsystemConfiguration {
      * Contains the logging template.
      *
      * @see Logger
-     * @see de.staropensource.sosengine.base.data.placeholders Global placeholder list
+     * @see de.staropensource.sosengine.base.data.placeholder Global placeholder list
      * @see de.staropensource.sosengine.base.logging.placeholders.logger Logger placeholder list
      * @since 1-alpha0
      *
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateDay.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateDay.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateDay.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateDay.java
index d6d4018..889c02a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateDay.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateDay.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateMonth.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateMonth.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateMonth.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateMonth.java
index d5b5ba8..dac767f 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateMonth.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateMonth.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateYear.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateYear.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateYear.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateYear.java
index 2a3b4ba..e78ce10 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/DateYear.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/DateYear.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
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/placeholder/EngineDependencyJansi.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJansi.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJansi.java
index 7ab6964..4c79bba 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJansi.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJansi.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/EngineDependencyJetbrainsAnnotations.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJetbrainsAnnotations.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJetbrainsAnnotations.java
index 2e9c0a6..37f8612 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyJetbrainsAnnotations.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyJetbrainsAnnotations.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/EngineDependencyLombok.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLombok.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLombok.java
index 1e03d79..ee7afde 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLombok.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLombok.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLwjgl.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLwjgl.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLwjgl.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLwjgl.java
index e232569..4c05bcc 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyLwjgl.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyLwjgl.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyReflections.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyReflections.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyReflections.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyReflections.java
index ad0077d..80879b9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencyReflections.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencyReflections.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencySlf4j.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencySlf4j.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencySlf4j.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencySlf4j.java
index 97d5987..993bedb 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineDependencySlf4j.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineDependencySlf4j.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitBranch.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitBranch.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitBranch.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitBranch.java
index 63f87c3..38df731 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitBranch.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitBranch.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitHeader.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitHeader.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitHeader.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitHeader.java
index 6be4944..11bb962 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitHeader.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitHeader.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitIdLong.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdLong.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitIdLong.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdLong.java
index 780764f..46d2119 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitIdLong.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdLong.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitIdShort.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdShort.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitIdShort.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdShort.java
index e9eeeb3..9ff31ea 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitIdShort.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitIdShort.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeDay.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeDay.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeDay.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeDay.java
index 305115f..b303618 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeDay.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeDay.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeHour.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeHour.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeHour.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeHour.java
index 35fd101..92301d9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeHour.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeHour.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeMinute.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMinute.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeMinute.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMinute.java
index e6e9f71..95df214 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeMinute.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMinute.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeMonth.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMonth.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeMonth.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMonth.java
index 5644e37..194535b 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeMonth.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeMonth.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeSecond.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeSecond.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeSecond.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeSecond.java
index 5802671..a5968a8 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeSecond.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeSecond.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeYear.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeYear.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeYear.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeYear.java
index 495f58a..fc5bc47 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitTimeYear.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitTimeYear.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommits.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommits.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommits.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommits.java
index 15a0365..25dd2ea 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommits.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommits.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitterEmail.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterEmail.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitterEmail.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterEmail.java
index a0850e5..f3ba820 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitterEmail.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterEmail.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitterName.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterName.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitterName.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterName.java
index 016294b..948d846 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitCommitterName.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitCommitterName.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitDirty.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitDirty.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitDirty.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitDirty.java
index f010d00..27bf9b9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineGitDirty.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineGitDirty.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/EnginePluginLombok.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginLombok.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginLombok.java
index 91512f1..e24eb3e 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginLombok.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginLombok.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/EnginePluginShadow.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginShadow.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginShadow.java
index 9ff294a..5dc1a33 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EnginePluginShadow.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EnginePluginShadow.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersion.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersion.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersion.java
index f52b1bc..63aecce 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersion.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 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/placeholder/EngineVersionFork.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionFork.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionFork.java
index ec056f6..a5b2a31 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionFork.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionFork.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/EngineVersionType.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionType.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionType.java
index 22f2b63..70dfb48 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionType.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionType.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/EngineVersionTyperelease.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionTyperelease.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionTyperelease.java
index 7e3a51d..ccff2be 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionTyperelease.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionTyperelease.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/EngineVersionVersion.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionVersion.java
index 000a6c1..8bd9826 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/EngineVersionVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/EngineVersionVersion.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.EngineInformation;
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/placeholder/JvmArguments.java
similarity index 97%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmArguments.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmArguments.java
index 2d8807f..fc7bc18 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmArguments.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmArguments.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
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/placeholder/JvmImplementationName.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationName.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationName.java
index c23e109..b6e7151 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationName.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationName.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
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/placeholder/JvmImplementationVendor.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVendor.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVendor.java
index dfe3d60..b2c0ab6 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVendor.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVendor.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
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/placeholder/JvmImplementationVersion.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVersion.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVersion.java
index ea633db..f2e1cb9 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmImplementationVersion.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmImplementationVersion.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
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/placeholder/JvmJava.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmJava.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmJava.java
index 14f1bb2..89e1c6c 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmJava.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmJava.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
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/placeholder/JvmUptime.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmUptime.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmUptime.java
index a92de1c..df17228 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/JvmUptime.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/JvmUptime.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.data.info.JvmInformation;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeEpoch.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeEpoch.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeEpoch.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeEpoch.java
index 72399bb..dad980a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeEpoch.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeEpoch.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeHour.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeHour.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeHour.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeHour.java
index 389f5c9..f421674 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeHour.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeHour.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeMinute.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeMinute.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeMinute.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeMinute.java
index f96ac55..8d0047a 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeMinute.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeMinute.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeSecond.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeSecond.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeSecond.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeSecond.java
index 28fb009..143d1a0 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeSecond.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeSecond.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.utility.Miscellaneous;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeZone.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeZone.java
similarity index 96%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeZone.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeZone.java
index d592f61..5f7f6b2 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/TimeZone.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/TimeZone.java
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import org.jetbrains.annotations.NotNull;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/package-info.java b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/package-info.java
similarity index 94%
rename from base/src/main/java/de/staropensource/sosengine/base/data/placeholders/package-info.java
rename to base/src/main/java/de/staropensource/sosengine/base/data/placeholder/package-info.java
index c30091b..20575d1 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/data/placeholders/package-info.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/data/placeholder/package-info.java
@@ -24,4 +24,4 @@
  * @see de.staropensource.sosengine.base.classes.Placeholder
  * @since 1-alpha0
  */
-package de.staropensource.sosengine.base.data.placeholders;
+package de.staropensource.sosengine.base.data.placeholder;
diff --git a/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java b/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
index 17876bf..f6f58ca 100644
--- a/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
+++ b/base/src/main/java/de/staropensource/sosengine/base/utility/PlaceholderEngine.java
@@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.utility;
 
 import de.staropensource.sosengine.base.classes.Placeholder;
 import de.staropensource.sosengine.base.classes.logging.LogIssuer;
-import de.staropensource.sosengine.base.data.placeholders.*;
+import de.staropensource.sosengine.base.data.placeholder.*;
 import de.staropensource.sosengine.base.logging.Logger;
 import de.staropensource.sosengine.base.types.CodePart;
 import lombok.Getter;