diff --git a/.gitignore b/.gitignore
index 21776f4..d376959 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 servers.json
 admin.json
+*.hprof
 /build
 /.gradle
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 908158b..8041a71 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1aabf22b-2f57-46ac-9973-367d8668ffd3" name="Default Changelist" comment="" />
+    <list default="true" id="1aabf22b-2f57-46ac-9973-367d8668ffd3" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/Admin.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Admin.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/Bot.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Bot.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/Channels.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Channels.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/Cli.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Cli.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/DataIO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/DataIO.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/Main.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/Main.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/extensions/Color.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/extensions/Color.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/model/BlogPostPreview.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/model/BlogPostPreview.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/web/BlogPostParser.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/web/BlogPostParser.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/kotlin/web/SiteWatcher.kt" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/kotlin/de/wulkanat/web/SiteWatcher.kt" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -15,9 +29,63 @@
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
+        <task path="$PROJECT_DIR$">
+          <activation />
+        </task>
         <projects_view>
           <tree_state>
-            <expand />
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Source Sets" type="e897c970:GradleViewContributor$SourceSetsNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="build" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="build setup" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="documentation" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="help" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="other" type="c8890929:TasksNode$1" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="HytaleUpdateBot" type="f1a62948:ProjectNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="verification" type="c8890929:TasksNode$1" />
+              </path>
+            </expand>
             <select />
           </tree_state>
         </projects_view>
@@ -48,29 +116,75 @@
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
+    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
   </component>
   <component name="RecentsManager">
+    <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="de.wulkanat" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot\src\main\kotlin\de\wulkanat" />
       <recent name="E:\Projects\Kotlin_Proj\HytaleUpdateBot" />
     </key>
   </component>
-  <component name="RunManager">
-    <configuration name="MainKt" type="JetRunConfigurationType" temporary="true" nameIsGenerated="true">
-      <module name="HytaleUpdateBot.main" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="MAIN_CLASS_NAME" value="MainKt" />
-      <option name="WORKING_DIRECTORY" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
+  <component name="RunManager" selected="JAR Application.HytaleUpdateBot-all-1.0-SNAPSHOT.jar">
+    <configuration name="HytaleUpdateBot [fatJar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="fatJar" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+      <method v="2" />
+    </configuration>
+    <configuration name="HytaleUpdateBot [jar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+      <ExternalSystemSettings>
+        <option name="executionName" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalSystemIdString" value="GRADLE" />
+        <option name="scriptParameters" />
+        <option name="taskDescriptions">
+          <list />
+        </option>
+        <option name="taskNames">
+          <list>
+            <option value="jar" />
+          </list>
+        </option>
+        <option name="vmOptions" />
+      </ExternalSystemSettings>
+      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
+      <method v="2" />
+    </configuration>
+    <configuration name="HytaleUpdateBot-1.0-SNAPSHOT-all.jar" type="JarApplication" temporary="true">
+      <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/HytaleUpdateBot-1.0-SNAPSHOT-all.jar" />
+      <method v="2" />
+    </configuration>
+    <configuration name="HytaleUpdateBot-1.0-SNAPSHOT.jar" type="JarApplication" temporary="true">
+      <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/HytaleUpdateBot-1.0-SNAPSHOT.jar" />
+      <method v="2" />
+    </configuration>
+    <configuration name="HytaleUpdateBot-all-1.0-SNAPSHOT.jar" type="JarApplication" temporary="true">
+      <option name="JAR_PATH" value="$PROJECT_DIR$/build/libs/HytaleUpdateBot-all-1.0-SNAPSHOT.jar" />
+      <method v="2" />
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Kotlin.MainKt" />
+        <item itemvalue="JAR Application.HytaleUpdateBot-all-1.0-SNAPSHOT.jar" />
+        <item itemvalue="JAR Application.HytaleUpdateBot-1.0-SNAPSHOT-all.jar" />
+        <item itemvalue="Gradle.HytaleUpdateBot [fatJar]" />
+        <item itemvalue="JAR Application.HytaleUpdateBot-1.0-SNAPSHOT.jar" />
+        <item itemvalue="Gradle.HytaleUpdateBot [jar]" />
       </list>
     </recent_temporary>
   </component>
@@ -92,42 +206,67 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="552" y="179" key="#Project_Structure/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597338262424" />
+    <state x="-1050" y="581" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1597352463714">
+      <screen x="-1050" y="105" width="1050" height="1640" />
+    </state>
+    <state x="-1050" y="581" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597352463714" />
+    <state x="633" y="446" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1597362173063">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="633" y="446" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597362173063" />
+    <state x="739" y="173" width="484" height="693" key="#org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog" timestamp="1597362199927">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="739" y="173" width="484" height="693" key="#org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597362199927" />
     <state x="128" y="270" width="490" height="591" key="#xdebugger.evaluate" timestamp="1597332665464">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="128" y="270" width="490" height="591" key="#xdebugger.evaluate/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597332665464" />
-    <state width="1876" height="282" key="GridCell.Tab.0.bottom" timestamp="1597341806078">
+    <state width="1876" height="161" key="GridCell.Tab.0.bottom" timestamp="1597362407964">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597341806078" />
-    <state width="1876" height="282" key="GridCell.Tab.0.center" timestamp="1597341806078">
+    <state width="1006" height="588" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
+    <state width="1876" height="161" key="GridCell.Tab.0.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597362407964" />
+    <state width="1876" height="161" key="GridCell.Tab.0.center" timestamp="1597362407964">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="282" key="GridCell.Tab.0.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597341806078" />
-    <state width="1876" height="282" key="GridCell.Tab.0.left" timestamp="1597341806078">
+    <state width="1006" height="588" key="GridCell.Tab.0.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329411" />
+    <state width="1876" height="161" key="GridCell.Tab.0.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597362407964" />
+    <state width="1876" height="161" key="GridCell.Tab.0.left" timestamp="1597362407964">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="282" key="GridCell.Tab.0.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597341806078" />
-    <state width="1876" height="282" key="GridCell.Tab.0.right" timestamp="1597341806078">
+    <state width="1006" height="588" key="GridCell.Tab.0.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329411" />
+    <state width="1876" height="161" key="GridCell.Tab.0.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597362407964" />
+    <state width="1876" height="161" key="GridCell.Tab.0.right" timestamp="1597362407964">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1876" height="282" key="GridCell.Tab.0.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597341806078" />
-    <state width="1876" height="348" key="GridCell.Tab.1.bottom" timestamp="1597339868293">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state width="1006" height="588" key="GridCell.Tab.0.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329411" />
+    <state width="1876" height="161" key="GridCell.Tab.0.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597362407964" />
+    <state width="1006" height="588" key="GridCell.Tab.1.bottom" timestamp="1597351329412">
+      <screen x="-1050" y="105" width="1050" height="1640" />
     </state>
+    <state width="1006" height="588" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
     <state width="1876" height="348" key="GridCell.Tab.1.bottom/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597339868293" />
-    <state width="1876" height="348" key="GridCell.Tab.1.center" timestamp="1597339868293">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state width="1006" height="588" key="GridCell.Tab.1.center" timestamp="1597351329412">
+      <screen x="-1050" y="105" width="1050" height="1640" />
     </state>
+    <state width="1006" height="588" key="GridCell.Tab.1.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
     <state width="1876" height="348" key="GridCell.Tab.1.center/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597339868293" />
-    <state width="1876" height="348" key="GridCell.Tab.1.left" timestamp="1597339868293">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state width="1006" height="588" key="GridCell.Tab.1.left" timestamp="1597351329412">
+      <screen x="-1050" y="105" width="1050" height="1640" />
     </state>
+    <state width="1006" height="588" key="GridCell.Tab.1.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
     <state width="1876" height="348" key="GridCell.Tab.1.left/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597339868293" />
-    <state width="1876" height="348" key="GridCell.Tab.1.right" timestamp="1597339868293">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <state width="1006" height="588" key="GridCell.Tab.1.right" timestamp="1597351329412">
+      <screen x="-1050" y="105" width="1050" height="1640" />
     </state>
+    <state width="1006" height="588" key="GridCell.Tab.1.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597351329412" />
     <state width="1876" height="348" key="GridCell.Tab.1.right/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597339868293" />
+    <state x="94" y="257" key="SettingsEditor" timestamp="1597361509050">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="-1040" y="568" key="SettingsEditor/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@-1050.105.1050.1640" timestamp="1597353858648" />
+    <state x="94" y="257" key="SettingsEditor/0.0.1920.1040/1920.-213.2560.1400/-1050.105.1050.1640@0.0.1920.1040" timestamp="1597361509050" />
     <state x="616" y="240" key="run.anything.popup" timestamp="1597325088886">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
diff --git a/build.gradle b/build.gradle
index 48b8fdd..ea69794 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,4 +26,22 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 
+jar {
+    manifest {
+        attributes('Main-Class': 'de.wulkanat.MainKt')
+    }
+}
+
+task fatJar(type: Jar) {
+    baseName = project.name + '-all'
+    from((configurations.compile.findAll { !it.path.endsWith(".pom") }).collect {
+        it.isDirectory() ? it : zipTree(it)
+    })
+    with jar
+    manifest {
+        attributes 'Main-Class': 'de.wulkanat.MainKt',
+                'Implementation-Version': version
+    }
+}
+
 apply plugin: 'kotlinx-serialization'
diff --git a/gradle.properties b/gradle.properties
index 29e08e8..c6280f6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+org.gradle.jvmargs=-Xmx1024m
\ No newline at end of file
diff --git a/src/main/kotlin/Admin.kt b/src/main/kotlin/de/wulkanat/Admin.kt
similarity index 96%
rename from src/main/kotlin/Admin.kt
rename to src/main/kotlin/de/wulkanat/Admin.kt
index 505eab2..98abb39 100644
--- a/src/main/kotlin/Admin.kt
+++ b/src/main/kotlin/de/wulkanat/Admin.kt
@@ -1,3 +1,5 @@
+package de.wulkanat
+
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import net.dv8tion.jda.api.EmbedBuilder
@@ -24,7 +26,7 @@ object Admin {
 
         admin = value?.retrieveUserById(userId)?.complete()
         if (admin == null) {
-            kotlin.io.println("Connection to Admin failed!")
+            kotlin.io.println("Connection to de.wulkanat.Admin failed!")
         } else {
             kotlin.io.println("Connected to ${admin!!.name}. No further errors will be printed here.")
         }
@@ -86,7 +88,7 @@ object Admin {
     fun ready() {
         sendDevMessage(
             EmbedBuilder()
-                .setTitle("Now watching for new Hytale Blogposts every ${updateMs/1000}s")
+                .setTitle("Now watching for new Hytale Blogposts every ${updateMs / 1000}s")
                 .setDescription(Channels.getServerNames().joinToString("\n"))
                 .setColor(Color.GREEN)
                 .build(),
diff --git a/src/main/kotlin/Bot.kt b/src/main/kotlin/de/wulkanat/Bot.kt
similarity index 96%
rename from src/main/kotlin/Bot.kt
rename to src/main/kotlin/de/wulkanat/Bot.kt
index 668eb1c..68bacfc 100644
--- a/src/main/kotlin/Bot.kt
+++ b/src/main/kotlin/de/wulkanat/Bot.kt
@@ -1,3 +1,5 @@
+package de.wulkanat
+
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.hooks.ListenerAdapter
 
diff --git a/src/main/kotlin/Channels.kt b/src/main/kotlin/de/wulkanat/Channels.kt
similarity index 94%
rename from src/main/kotlin/Channels.kt
rename to src/main/kotlin/de/wulkanat/Channels.kt
index 9b1e4c7..e37735e 100644
--- a/src/main/kotlin/Channels.kt
+++ b/src/main/kotlin/de/wulkanat/Channels.kt
@@ -1,3 +1,5 @@
+package de.wulkanat
+
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlinx.serialization.list
@@ -82,6 +84,10 @@ object Channels {
     }
 
     private fun saveChannels() {
-        SERVERS_FILE.writeText(json.stringify(DiscordChannel.serializer().list, channels))
+        SERVERS_FILE.writeText(
+            json.stringify(
+                DiscordChannel.serializer().list,
+                channels
+            ))
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/Cli.kt b/src/main/kotlin/de/wulkanat/Cli.kt
similarity index 95%
rename from src/main/kotlin/Cli.kt
rename to src/main/kotlin/de/wulkanat/Cli.kt
index af72a85..f23f986 100644
--- a/src/main/kotlin/Cli.kt
+++ b/src/main/kotlin/de/wulkanat/Cli.kt
@@ -1,7 +1,9 @@
-import model.BlogPostPreview
+package de.wulkanat
+
+import de.wulkanat.model.BlogPostPreview
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.hooks.ListenerAdapter
-import web.SiteWatcher
+import de.wulkanat.web.SiteWatcher
 import kotlin.system.exitProcess
 
 class Cli : ListenerAdapter() {
diff --git a/src/main/kotlin/DataIO.kt b/src/main/kotlin/de/wulkanat/DataIO.kt
similarity index 94%
rename from src/main/kotlin/DataIO.kt
rename to src/main/kotlin/de/wulkanat/DataIO.kt
index 98a53f9..910a9f7 100644
--- a/src/main/kotlin/DataIO.kt
+++ b/src/main/kotlin/de/wulkanat/DataIO.kt
@@ -1,3 +1,5 @@
+package de.wulkanat
+
 import kotlinx.serialization.Serializable
 import java.io.File
 
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/de/wulkanat/Main.kt
similarity index 88%
rename from src/main/kotlin/Main.kt
rename to src/main/kotlin/de/wulkanat/Main.kt
index 6a2a59f..f263e24 100644
--- a/src/main/kotlin/Main.kt
+++ b/src/main/kotlin/de/wulkanat/Main.kt
@@ -1,12 +1,15 @@
+package de.wulkanat
+
 import net.dv8tion.jda.api.JDABuilder
 import net.dv8tion.jda.api.entities.Activity
 import net.dv8tion.jda.api.requests.GatewayIntent
-import web.SiteWatcher
+import de.wulkanat.web.SiteWatcher
 import kotlin.concurrent.timer
 
 fun main() {
     // TODO: move toke into file
-    val builder = JDABuilder.createLight(Admin.token,
+    val builder = JDABuilder.createLight(
+        Admin.token,
         GatewayIntent.GUILD_MESSAGES, GatewayIntent.DIRECT_MESSAGES)
         .addEventListeners(Bot())
         .setActivity(Activity.watching("for new Blogposts"))
diff --git a/src/main/kotlin/extensions/Color.kt b/src/main/kotlin/de/wulkanat/extensions/Color.kt
similarity index 89%
rename from src/main/kotlin/extensions/Color.kt
rename to src/main/kotlin/de/wulkanat/extensions/Color.kt
index 8455564..00ed297 100644
--- a/src/main/kotlin/extensions/Color.kt
+++ b/src/main/kotlin/de/wulkanat/extensions/Color.kt
@@ -1,4 +1,4 @@
-package extensions
+package de.wulkanat.extensions
 
 import java.awt.Color
 
diff --git a/src/main/kotlin/model/BlogPostPreview.kt b/src/main/kotlin/de/wulkanat/model/BlogPostPreview.kt
similarity index 91%
rename from src/main/kotlin/model/BlogPostPreview.kt
rename to src/main/kotlin/de/wulkanat/model/BlogPostPreview.kt
index ac2bd80..9d9b683 100644
--- a/src/main/kotlin/model/BlogPostPreview.kt
+++ b/src/main/kotlin/de/wulkanat/model/BlogPostPreview.kt
@@ -1,8 +1,8 @@
-package model
+package de.wulkanat.model
 
 import net.dv8tion.jda.api.EmbedBuilder
 import net.dv8tion.jda.api.entities.MessageEmbed
-import extensions.hex2Rgb
+import de.wulkanat.extensions.hex2Rgb
 
 data class BlogPostPreview(
     val title: String,
diff --git a/src/main/kotlin/web/BlogPostParser.kt b/src/main/kotlin/de/wulkanat/web/BlogPostParser.kt
similarity index 92%
rename from src/main/kotlin/web/BlogPostParser.kt
rename to src/main/kotlin/de/wulkanat/web/BlogPostParser.kt
index 663d4c7..5eaf943 100644
--- a/src/main/kotlin/web/BlogPostParser.kt
+++ b/src/main/kotlin/de/wulkanat/web/BlogPostParser.kt
@@ -1,6 +1,6 @@
-package web
+package de.wulkanat.web
 
-import model.BlogPostPreview
+import de.wulkanat.model.BlogPostPreview
 import org.jsoup.nodes.Document
 import org.jsoup.nodes.Element
 
diff --git a/src/main/kotlin/web/SiteWatcher.kt b/src/main/kotlin/de/wulkanat/web/SiteWatcher.kt
similarity index 90%
rename from src/main/kotlin/web/SiteWatcher.kt
rename to src/main/kotlin/de/wulkanat/web/SiteWatcher.kt
index 8ec1a84..36893de 100644
--- a/src/main/kotlin/web/SiteWatcher.kt
+++ b/src/main/kotlin/de/wulkanat/web/SiteWatcher.kt
@@ -1,6 +1,7 @@
-package web
+package de.wulkanat.web
 
-import model.BlogPostPreview
+import de.wulkanat.Admin
+import de.wulkanat.model.BlogPostPreview
 import org.jsoup.Jsoup
 import java.io.IOException