diff --git a/.gitignore b/.gitignore
index 618420f..9545d80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ pocasi.txt
 test.txt
 timecalc.conf
 focus.txt
+dist/*
diff --git a/build.sh b/build.sh
index b22963f..b9ae6fe 100644
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,61 @@
-mvn clean package
-#mv target/*jar-with-all-dependencies*.jar C:/Users/Robert/Desktop/rv
-mv target/*.jar C:/Users/Robert/Desktop/rv
-rm -r target
+#!/bin/bash
+
+MVN_ARG=$1
+replace () {
+INPUT=$1
+OLD=$2
+NEW=$3
+OUTPUT=$(echo $INPUT | sed "s/$OLD/$NEW/")
+echo "$OUTPUT"
+}
+replaceInFile() {
+INPUT=$1
+OLD=$2
+NEW=$3
+echo INPUT=$INPUT
+echo OLD=$OLD
+echo NEW=$NEW
+sed -i 's/$OLD/$NEW/g' $INPUT
+cat $INPUT
+}
+
+echo ... 1. Building
+mvn clean install $MVN_ARG
+#Use mvn clean install -o to build offline
+
+if [ $? -eq 0 ]
+then
+    echo "Build was finished"
+else
+    echo "Build failed. Exiting"
+    exit
+fi
+
+echo ... 2. Deleting dist directory
+rm ./dist/*.jar
+
+echo ... 3. Detecting version
+cd modules/time-calc-app/target
+VERSION=`ls time-calc-app-*-jar-with-all-dependencies.jar`
+VERSION=`replace $VERSION "-jar-with-all-dependencies.jar" ""`
+VERSION=`replace $VERSION "time-calc-app-" ""`
+ORIG_VERSION=$VERSION
+BUILD_TIMESTAMP=`date +'%Y%m%d_%H%M%S'`
+if [[ `ls time-calc-app-*-jar-with-all-dependencies.jar` == *"SNAPSHOT"* ]];
+then
+    VERSION=`echo $VERSION-$BUILD_TIMESTAMP`
+else
+    echo "Release is in progress."
+fi
+echo version=$VERSION
+cd ../../..
+mkdir dist
+echo $VERSION>./dist/VERSION
+
+echo ... 4. Moving new jar file to dist directory
+mv ./modules/time-calc-app/target/time-calc-app-$ORIG_VERSION-jar-with-all-dependencies.jar ./dist/time-calc-$VERSION.jar
+rm ./modules/time-calc-app/target/time-calc-app-$ORIG_VERSION.jar
+
+cp ./dist/time-calc-$VERSION.jar C:/Users/Robert/Desktop/rv
+
+
diff --git a/modules/time-calc-app/pom.xml b/modules/time-calc-app/pom.xml
new file mode 100644
index 0000000..d70bdb1
--- /dev/null
+++ b/modules/time-calc-app/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <relativePath>./../../pom.xml</relativePath>
+        <groupId>org.nanoboot.utils</groupId>
+        <artifactId>time-calc</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>time-calc-app</artifactId>
+
+    <name>time-calc-app</name>
+    <description>time-calc-app</description>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.nanoboot.utils.timecalc.main.Main</mainClass>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                        <manifestEntries>
+                            <Build-Date>${timestamp}</Build-Date>
+                        </manifestEntries>
+                    </archive>
+                    <!--                    <descriptorRefs>-->
+                    <!--                        <descriptorRef>jar-with-dependencies</descriptorRef>-->
+                    <!--                    </descriptorRefs>-->
+                    <descriptors>
+                        <descriptor>./src/main/resources/install.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/entity/Visibility.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/common/ComponentRegistry.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/ComponentRegistry.java
similarity index 97%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/common/ComponentRegistry.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/ComponentRegistry.java
index 04766b6..b5a07ab 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/common/ComponentRegistry.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/ComponentRegistry.java
@@ -6,7 +6,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class ComponentRegistry {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcButton.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcButton.java
similarity index 97%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcButton.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcButton.java
index 2b7c0a3..e2c8f5b 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcButton.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcButton.java
@@ -5,7 +5,7 @@ import javax.swing.Timer;
 import java.awt.Color;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class TimeCalcButton extends JButton {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
similarity index 97%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
index 991a46c..ed2933c 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/TimeCalcWindow.java
@@ -5,7 +5,7 @@ import java.awt.Component;
 import java.awt.HeadlessException;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class TimeCalcWindow extends JFrame {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/common/Toaster.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/Toaster.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/common/Toaster.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/Toaster.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/common/WeatherWindow.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/WeatherWindow.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/common/WeatherWindow.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/WeatherWindow.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/common/Widget.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/Widget.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/common/Widget.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/common/Widget.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/AnalogClock.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/AnalogClock.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/AnalogClock.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/AnalogClock.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/Battery.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/DayBattery.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/DayBattery.java
similarity index 91%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/DayBattery.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/DayBattery.java
index c19825c..865e28a 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/DayBattery.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/DayBattery.java
@@ -1,7 +1,7 @@
 package org.nanoboot.utils.timecalc.gui.progress;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class DayBattery extends Battery{
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java
similarity index 98%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java
index 71b6b23..59a0e47 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/HourBattery.java
@@ -3,7 +3,7 @@ package org.nanoboot.utils.timecalc.gui.progress;
 import org.nanoboot.utils.timecalc.utils.TimeHM;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class HourBattery extends Battery{
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java
similarity index 96%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java
index a1115a0..f31086c 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/MonthBattery.java
@@ -1,7 +1,7 @@
 package org.nanoboot.utils.timecalc.gui.progress;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class MonthBattery extends Battery{
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressCircle.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressCircle.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressCircle.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressCircle.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressSquare.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressSquare.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressSquare.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/ProgressSquare.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WalkingHumanProgressAsciiArt.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WalkingHumanProgressAsciiArt.java
similarity index 99%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/WalkingHumanProgressAsciiArt.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WalkingHumanProgressAsciiArt.java
index 1d485f2..efe3f7f 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WalkingHumanProgressAsciiArt.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WalkingHumanProgressAsciiArt.java
@@ -20,7 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class WalkingHumanProgressAsciiArt extends JTextPane {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java
similarity index 96%
rename from src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java
index e8be4d7..075dff5 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/gui/progress/WeekBattery.java
@@ -3,7 +3,7 @@ package org.nanoboot.utils.timecalc.gui.progress;
 import org.nanoboot.utils.timecalc.utils.TimeHM;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class WeekBattery extends Battery{
diff --git a/src/main/java/org/nanoboot/utils/timecalc/main/AboutButton.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/AboutButton.java
similarity index 97%
rename from src/main/java/org/nanoboot/utils/timecalc/main/AboutButton.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/AboutButton.java
index 42e31b2..5dc739b 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/main/AboutButton.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/AboutButton.java
@@ -6,7 +6,7 @@ import org.nanoboot.utils.timecalc.utils.Utils;
 import javax.swing.JOptionPane;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class AboutButton extends TimeCalcButton {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/main/Main.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/Main.java
similarity index 99%
rename from src/main/java/org/nanoboot/utils/timecalc/main/Main.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/Main.java
index 48dec75..8b78638 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/main/Main.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/Main.java
@@ -8,7 +8,7 @@ import javax.swing.JOptionPane;
 import java.io.IOException;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 31.01.2024
  */
 public class Main {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcConf.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcConf.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcConf.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcConf.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcException.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcException.java
similarity index 91%
rename from src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcException.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcException.java
index 74d02df..c0f4fc9 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcException.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcException.java
@@ -1,7 +1,7 @@
 package org.nanoboot.utils.timecalc.main;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class TimeCalcException extends RuntimeException{
diff --git a/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/main/TimeCalcManager.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/BooleanHolder.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/BooleanHolder.java
similarity index 97%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/BooleanHolder.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/BooleanHolder.java
index 3bba8f7..bfea94a 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/utils/BooleanHolder.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/BooleanHolder.java
@@ -1,7 +1,7 @@
 package org.nanoboot.utils.timecalc.utils;
 
 /**
- * @author pc00289
+ * @author Robert
  * @since 16.02.2024
  */
 public class BooleanHolder {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/Constants.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/Constants.java
similarity index 95%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/Constants.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/Constants.java
index b25190f..85023fe 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/utils/Constants.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/Constants.java
@@ -1,7 +1,7 @@
 package org.nanoboot.utils.timecalc.utils;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class Constants {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/DateFormats.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/DateFormats.java
similarity index 97%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/DateFormats.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/DateFormats.java
index 9e367e8..67c2752 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/utils/DateFormats.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/DateFormats.java
@@ -6,7 +6,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class DateFormats {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/FileConstants.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/FileConstants.java
similarity index 95%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/FileConstants.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/FileConstants.java
index ab199fc..2a07a05 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/utils/FileConstants.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/FileConstants.java
@@ -3,7 +3,7 @@ package org.nanoboot.utils.timecalc.utils;
 import java.io.File;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class FileConstants {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/HttpProxy.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/HttpProxy.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/HttpProxy.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/HttpProxy.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/Jokes.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/Jokes.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/Jokes.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/Jokes.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/JokesTxt.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/JokesTxt.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/JokesTxt.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/JokesTxt.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/NumberFormats.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/NumberFormats.java
similarity index 97%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/NumberFormats.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/NumberFormats.java
index c76d052..f86a4fa 100644
--- a/src/main/java/org/nanoboot/utils/timecalc/utils/NumberFormats.java
+++ b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/NumberFormats.java
@@ -4,7 +4,7 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 
 /**
- * @author Robert
+ * @author pc00289
  * @since 21.02.2024
  */
 public class NumberFormats {
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/TimeHM.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/TimeHM.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/TimeHM.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/TimeHM.java
diff --git a/src/main/java/org/nanoboot/utils/timecalc/utils/Utils.java b/modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/Utils.java
similarity index 100%
rename from src/main/java/org/nanoboot/utils/timecalc/utils/Utils.java
rename to modules/time-calc-app/src/main/java/org/nanoboot/utils/timecalc/utils/Utils.java
diff --git a/src/main/resources/install.xml b/modules/time-calc-app/src/main/resources/install.xml
similarity index 100%
rename from src/main/resources/install.xml
rename to modules/time-calc-app/src/main/resources/install.xml
diff --git a/src/main/resources/vtipy.txt b/modules/time-calc-app/src/main/resources/vtipy.txt
similarity index 100%
rename from src/main/resources/vtipy.txt
rename to modules/time-calc-app/src/main/resources/vtipy.txt
diff --git a/modules/time-calc-swing/pom.xml b/modules/time-calc-swing/pom.xml
new file mode 100644
index 0000000..afa2103
--- /dev/null
+++ b/modules/time-calc-swing/pom.xml
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <relativePath>./../../pom.xml</relativePath>
+        <groupId>org.nanoboot.utils</groupId>
+        <artifactId>time-calc</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>time-calc-swing</artifactId>
+    <packaging>jar</packaging>
+
+</project>
diff --git a/modules/time-calc-swing/src/main/java/.gitkeep b/modules/time-calc-swing/src/main/java/.gitkeep
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/modules/time-calc-swing/src/main/java/.gitkeep
@@ -0,0 +1 @@
+ 
diff --git a/modules/time-calc-swing/src/main/resources/.gitkeep b/modules/time-calc-swing/src/main/resources/.gitkeep
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/modules/time-calc-swing/src/main/resources/.gitkeep
@@ -0,0 +1 @@
+ 
diff --git a/modules/time-calc-swing/src/test/java/.gitkeep b/modules/time-calc-swing/src/test/java/.gitkeep
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/modules/time-calc-swing/src/test/java/.gitkeep
@@ -0,0 +1 @@
+ 
diff --git a/pom.xml b/pom.xml
index d585e46..c299652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,83 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.nanoboot.utils</groupId>
     <artifactId>time-calc</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-
-    <name>time-calc</name>
-    <description>time-calc</description>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
+    <name>Time Calc</name>
+    <description>Tool to track time</description>
 
     <properties>
+        <time-calc.version>0.1.0-SNAPSHOT</time-calc.version>
         <java.version>1.8</java.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <lib.dir>${basedir}/lib</lib.dir>
+        <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss</maven.build.timestamp.format>
         <timestamp>${maven.build.timestamp}</timestamp>
         <lombok.version>1.18.22</lombok.version>
+        <checkstyle.config.location>src/main/resources/sun_checks.xml</checkstyle.config.location>
+        <checkstyle.skip>true</checkstyle.skip><!-- TODO : to be removed -->
+
     </properties>
 
+    <developers>
+        <developer>
+            <id>robertvokac</id>
+            <name>Robert Vokáč</name>
+            <roles>
+                <role>developer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <modules>
+<!--        <module>modules/time-calc-entity</module>-->
+<!--        <module>modules/time-calc-utils</module>-->
+<!--        <module>modules/time-calc-persistence-api</module>-->
+<!--        <module>modules/time-calc-persistence-impl-mock</module>-->
+<!--        <module>modules/time-calc-persistence-impl-sqlite</module>-->
+<!--        <module>modules/time-calc-swing</module>-->
+        <module>modules/time-calc-app</module>
+
+    </modules>
+    <dependencies>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <dependencyManagement>
+        <dependencies>
+
+<!--            <dependency>-->
+<!--                <groupId>private.dme</groupId>-->
+<!--                <artifactId>jfreechart</artifactId>-->
+<!--                <version>1.5.3</version>-->
+<!--                <scope>system</scope>-->
+<!--                <systemPath>${lib.dir}/jfreechart-1.5.3.jar</systemPath>-->
+<!--            </dependency>-->
+
+        </dependencies>
+    </dependencyManagement>
+
     <build>
+        <!--        <finalName>time-calc</finalName>-->
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>org.nanoboot.utils.timecalc.main.Main</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <!-- Here come other details
-                ...
-                -->
             </plugin>
-<!--            <plugin>-->
-<!--                <artifactId>maven-assembly-plugin</artifactId>-->
-<!--                <configuration>-->
-<!--                    <archive>-->
-<!--                        <manifest>-->
-<!--                            <mainClass>Main</mainClass>-->
-<!--                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
-<!--                        </manifest>-->
-<!--                        <manifestEntries>-->
-<!--                            <Build-Date>${timestamp}</Build-Date>-->
-<!--                        </manifestEntries>-->
-<!--                    </archive>-->
-<!--                    &lt;!&ndash;                    <descriptorRefs>&ndash;&gt;-->
-<!--                    &lt;!&ndash;                        <descriptorRef>jar-with-dependencies</descriptorRef>&ndash;&gt;-->
-<!--                    &lt;!&ndash;                    </descriptorRefs>&ndash;&gt;-->
-<!--                    <descriptors>-->
-<!--                        <descriptor>./src/main/resources/install.xml</descriptor>-->
-<!--                    </descriptors>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <id>make-assembly</id> &lt;!&ndash; this is used for inheritance merges &ndash;&gt;-->
-<!--                        <phase>package</phase> &lt;!&ndash; bind to the packaging phase &ndash;&gt;-->
-<!--                        <goals>-->
-<!--                            <goal>single</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -96,14 +95,37 @@
                     <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <phase>validate</phase>
+                        <configuration>
+                            <consoleOutput>true</consoleOutput>
+                            <failsOnError>true</failsOnError>
+                        </configuration>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.4.1</version>
+                <configuration>
+
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+</project>
diff --git a/timecalc.conf.template b/timecalc.conf.template
deleted file mode 100644
index e76372b..0000000
--- a/timecalc.conf.template
+++ /dev/null
@@ -1,4 +0,0 @@
-clock.colorful=false
-clock.hands.long=false
-jokes.visible=true
-battery.waves.enabled=false
\ No newline at end of file