diff --git a/Effekte Challenge V2/pom.xml b/Effekte Challenge V2/pom.xml
index 057b552..4ae60d8 100644
--- a/Effekte Challenge V2/pom.xml	
+++ b/Effekte Challenge V2/pom.xml	
@@ -8,7 +8,7 @@
     <artifactId>effekte-challenge-v2</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     
-    <name>Effekte Challenge V2</name>
+    <name>Effekte</name>
     <url>http://www.example.com</url>
 
     <properties>
diff --git a/Effekte Challenge V2/src/main/java/com/xonics/classes/Effekt.java b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/Effekt.java
similarity index 93%
rename from Effekte Challenge V2/src/main/java/com/xonics/classes/Effekt.java
rename to Effekte Challenge V2/src/main/java/com/xonics/ef/classes/Effekt.java
index fe6ffe3..0e66e02 100644
--- a/Effekte Challenge V2/src/main/java/com/xonics/classes/Effekt.java	
+++ b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/Effekt.java	
@@ -1,4 +1,4 @@
-package com.xonics.classes;
+package com.xonics.ef.classes;
 
 import org.bukkit.potion.PotionEffectType;
 
diff --git a/Effekte Challenge V2/src/main/java/com/xonics/classes/EffektLibrary.java b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/EffektLibrary.java
similarity index 97%
rename from Effekte Challenge V2/src/main/java/com/xonics/classes/EffektLibrary.java
rename to Effekte Challenge V2/src/main/java/com/xonics/ef/classes/EffektLibrary.java
index 8090ebe..00d0586 100644
--- a/Effekte Challenge V2/src/main/java/com/xonics/classes/EffektLibrary.java	
+++ b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/EffektLibrary.java	
@@ -1,9 +1,9 @@
-package com.xonics.classes;
+package com.xonics.ef.classes;
 
 import java.util.List;
 import org.bukkit.potion.PotionEffectType;
 
-public class EffektLibrary {
+public abstract class EffektLibrary {
 
     private static List<Effekt> effects = List.of(
             new Effekt(PotionEffectType.SPEED, EffektTyp.GOOD),
diff --git a/Effekte Challenge V2/src/main/java/com/xonics/classes/EffektRevolver.java b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/EffektRevolver.java
similarity index 97%
rename from Effekte Challenge V2/src/main/java/com/xonics/classes/EffektRevolver.java
rename to Effekte Challenge V2/src/main/java/com/xonics/ef/classes/EffektRevolver.java
index 6fef47a..d350c59 100644
--- a/Effekte Challenge V2/src/main/java/com/xonics/classes/EffektRevolver.java	
+++ b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/EffektRevolver.java	
@@ -1,4 +1,4 @@
-package com.xonics.classes;
+package com.xonics.ef.classes;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/Timer.java b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/Timer.java
new file mode 100644
index 0000000..cf5a681
--- /dev/null
+++ b/Effekte Challenge V2/src/main/java/com/xonics/ef/classes/Timer.java	
@@ -0,0 +1,64 @@
+package com.xonics.ef.classes;
+
+import org.bukkit.scheduler.BukkitRunnable;
+import com.xonics.ef.main;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class Timer {
+
+    private static int time;
+    private static BukkitRunnable task;
+    private static boolean paused = false;
+
+    public static void start() {
+        if (task != null)
+            return;
+        time = 0;
+
+        task = new BukkitRunnable() {
+            @Override
+            public void run() {
+                if (paused) {
+                    for (Player p : Bukkit.getOnlinePlayers()) {
+                        p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent("PAUSED"));
+                        return;
+                    }
+                }
+
+                time++;
+
+                for (Player p : Bukkit.getOnlinePlayers()) {
+                    p.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(getTime()));
+                }
+
+            }
+        };
+
+        task.runTaskTimer(main.getInstance(), 0L, 20L);
+    }
+
+    public static void pause() {
+        paused = true;
+    }
+
+    public static void resume() {
+        paused = false;
+    }
+
+    public static void stop() {
+        task.cancel();
+        task = null;
+        time = 0;
+        paused = false;
+    }
+
+    public static String getTime() {
+        int stunden = time / 3600;
+        int minuten = (time % 3600) / 60;
+        int sekunden = time % 60;
+        return String.format("%02d:%02d:%02d", stunden, minuten, sekunden);
+    }
+}
diff --git a/Effekte Challenge V2/src/main/java/com/xonics/ef/main.java b/Effekte Challenge V2/src/main/java/com/xonics/ef/main.java
index 56d15fa..c6e069e 100644
--- a/Effekte Challenge V2/src/main/java/com/xonics/ef/main.java	
+++ b/Effekte Challenge V2/src/main/java/com/xonics/ef/main.java	
@@ -6,9 +6,17 @@ import com.xonics.ef.listeners.PlayerListener;
 
 public class main extends JavaPlugin {
 
+    private static main instance;
+
+    public static main getInstance() {
+        return instance;
+    }
+
     @Override
     public void onEnable() {
 
+        instance = this;
+
         // Initialize managers
         PluginManager.getInstance().initialize();
 
diff --git a/Effekte Challenge V2/src/main/resources/plugin.yml b/Effekte Challenge V2/src/main/resources/plugin.yml
index c172e75..0125035 100644
--- a/Effekte Challenge V2/src/main/resources/plugin.yml	
+++ b/Effekte Challenge V2/src/main/resources/plugin.yml	
@@ -1,5 +1,5 @@
 main: com.xonics.ef.main
 version: 1.0.0-SNAPSHOT
-name: Effekte Challenge V2
+name: Effekte
 author: xonics
 api-version: 1.13
\ No newline at end of file
diff --git a/Effekte Challenge V2/target/classes/com/xonics/classes/Effekt.class b/Effekte Challenge V2/target/classes/com/xonics/classes/Effekt.class
deleted file mode 100644
index a1a1a9f..0000000
Binary files a/Effekte Challenge V2/target/classes/com/xonics/classes/Effekt.class and /dev/null differ
diff --git a/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Effekt.class b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Effekt.class
new file mode 100644
index 0000000..5cedd45
Binary files /dev/null and b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Effekt.class differ
diff --git a/Effekte Challenge V2/target/classes/com/xonics/classes/EffektLibrary.class b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektLibrary.class
similarity index 68%
rename from Effekte Challenge V2/target/classes/com/xonics/classes/EffektLibrary.class
rename to Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektLibrary.class
index 871e44c..1c8ecba 100644
Binary files a/Effekte Challenge V2/target/classes/com/xonics/classes/EffektLibrary.class and b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektLibrary.class differ
diff --git a/Effekte Challenge V2/target/classes/com/xonics/classes/EffektRevolver.class b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektRevolver.class
similarity index 64%
rename from Effekte Challenge V2/target/classes/com/xonics/classes/EffektRevolver.class
rename to Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektRevolver.class
index f0fdbf8..e100890 100644
Binary files a/Effekte Challenge V2/target/classes/com/xonics/classes/EffektRevolver.class and b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektRevolver.class differ
diff --git a/Effekte Challenge V2/target/classes/com/xonics/classes/EffektTyp.class b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektTyp.class
similarity index 54%
rename from Effekte Challenge V2/target/classes/com/xonics/classes/EffektTyp.class
rename to Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektTyp.class
index b830c7e..560d6ca 100644
Binary files a/Effekte Challenge V2/target/classes/com/xonics/classes/EffektTyp.class and b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/EffektTyp.class differ
diff --git a/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Timer$1.class b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Timer$1.class
new file mode 100644
index 0000000..c45eb56
Binary files /dev/null and b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Timer$1.class differ
diff --git a/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Timer.class b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Timer.class
new file mode 100644
index 0000000..53acb6e
Binary files /dev/null and b/Effekte Challenge V2/target/classes/com/xonics/ef/classes/Timer.class differ
diff --git a/Effekte Challenge V2/target/classes/com/xonics/ef/main.class b/Effekte Challenge V2/target/classes/com/xonics/ef/main.class
index 0fc67b4..47ff676 100644
Binary files a/Effekte Challenge V2/target/classes/com/xonics/ef/main.class and b/Effekte Challenge V2/target/classes/com/xonics/ef/main.class differ
diff --git a/Effekte Challenge V2/target/classes/plugin.yml b/Effekte Challenge V2/target/classes/plugin.yml
index c172e75..0125035 100644
--- a/Effekte Challenge V2/target/classes/plugin.yml	
+++ b/Effekte Challenge V2/target/classes/plugin.yml	
@@ -1,5 +1,5 @@
 main: com.xonics.ef.main
 version: 1.0.0-SNAPSHOT
-name: Effekte Challenge V2
+name: Effekte
 author: xonics
 api-version: 1.13
\ No newline at end of file