From d8bd19a08a4381765e9744dc77e9ff685ef76752 Mon Sep 17 00:00:00 2001
From: Esophose <esophose@gmail.com>
Date: Fri, 29 Mar 2019 21:59:10 -0600
Subject: [PATCH] Refactor into maven modules

---
 .gitlab-ci.yml                                |  6 +-
 LICENSE                                       |  2 +-
 UltimateTimber-Adapter/Current/Current.iml    | 17 ++++
 UltimateTimber-Adapter/Current/pom.xml        | 48 ++++++++++
 .../CurrentAdapter.java                       |  0
 .../CurrentBlockData.java                     |  0
 .../hooks/CurrentJobsHook.java                | 33 +++++++
 .../hooks/CurrentMcMMOHook.java               | 60 ++++++++++++
 UltimateTimber-Adapter/Legacy/Legacy.iml      | 17 ++++
 UltimateTimber-Adapter/Legacy/pom.xml         | 48 ++++++++++
 .../LegacyAdapter.java                        |  0
 .../LegacyBlockData.java                      |  3 +-
 .../hooks/LegacyJobsHook.java                 |  5 +-
 .../hooks/LegacyMcMMOHook.java                |  7 +-
 UltimateTimber/Core/UltimateTimber-Core.iml   | 14 +++
 UltimateTimber/Core/pom.xml                   | 27 ++++++
 .../ultimatetimber/adapter/IBlockData.java    |  0
 .../adapter/VersionAdapter.java               |  1 -
 .../adapter/VersionAdapterType.java           |  0
 .../ultimatetimber/hook}/TimberHook.java      |  2 +-
 .../ultimatetimber/tree/DetectedTree.java     |  0
 .../ultimatetimber/tree/FallingTreeBlock.java | 10 +-
 .../ultimatetimber/tree/ITreeBlock.java       |  7 --
 .../ultimatetimber/tree/TreeBlock.java        |  6 --
 .../ultimatetimber/tree/TreeBlockSet.java     |  0
 .../ultimatetimber/tree/TreeBlockType.java    |  0
 .../ultimatetimber/tree/TreeDefinition.java   |  0
 .../songoda/ultimatetimber/tree/TreeLoot.java |  0
 .../songoda/ultimatetimber/utils/Methods.java |  0
 .../songoda/ultimatetimber/utils/Metrics.java |  0
 .../songoda/ultimatetimber/utils/NMSUtil.java |  0
 .../Plugin/UltimateTimber-Plugin.iml          | 18 ++++
 UltimateTimber/Plugin/pom.xml                 | 78 +++++++++++++++
 .../ultimatetimber/UltimateTimber.java        |  0
 .../animation/TreeAnimation.java              |  2 +-
 .../animation/TreeAnimationChaos.java         |  2 +-
 .../animation/TreeAnimationDisintegrate.java  |  2 +-
 .../animation/TreeAnimationFancy.java         |  2 +-
 .../animation/TreeAnimationNone.java          |  2 +-
 .../animation/TreeAnimationType.java          |  2 +-
 .../ultimatetimber/events/TreeEvent.java      | 56 +++++------
 .../ultimatetimber/events/TreeFallEvent.java  | 80 ++++++++--------
 .../ultimatetimber/events/TreeFellEvent.java  | 54 +++++------
 .../manager/ChoppingManager.java              |  0
 .../manager/CommandManager.java               |  2 +-
 .../manager/ConfigurationManager.java         |  0
 .../ultimatetimber/manager/HookManager.java   | 10 +-
 .../ultimatetimber/manager/Manager.java       |  0
 .../manager/SaplingManager.java               |  0
 .../manager/TreeAnimationManager.java         |  0
 .../manager/TreeDefinitionManager.java        |  0
 .../manager/TreeDetectionManager.java         |  0
 .../manager/TreeFallManager.java              |  0
 .../old_code/AxeDurability.java               |  1 -
 .../ultimatetimber/old_code/CustomLoot.java   |  0
 .../old_code/DefaultConfig.java               |  0
 .../ultimatetimber/old_code/EventFilter.java  |  0
 .../old_code/NoAnimationTreeDestroyer.java    |  0
 .../old_code/TreeEntityDamage.java            |  0
 .../old_code/TreeFallAnimation.java           |  0
 .../old_code/TreeFallListener.java            |  0
 .../ultimatetimber/old_code/TreeLoot.java     |  4 +-
 .../ultimatetimber/old_code/TreeReplant.java  |  2 +-
 .../ultimatetimber/old_code/TreeSounds.java   |  0
 UltimateTimber/Plugin/src/main/main.iml       | 11 +++
 .../src}/main/resources/config-current.yml    |  0
 .../src}/main/resources/config-legacy.yml     |  0
 .../Plugin/src}/main/resources/plugin.yml     |  0
 pom-old.xml                                   | 94 +++++++++++++++++++
 pom.xml                                       | 74 +++------------
 70 files changed, 601 insertions(+), 208 deletions(-)
 create mode 100644 UltimateTimber-Adapter/Current/Current.iml
 create mode 100644 UltimateTimber-Adapter/Current/pom.xml
 rename {src/main/java/com/songoda/ultimatetimber/adapter/current => UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current}/CurrentAdapter.java (100%)
 rename {src/main/java/com/songoda/ultimatetimber/adapter/current => UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current}/CurrentBlockData.java (100%)
 create mode 100644 UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentJobsHook.java
 create mode 100644 UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentMcMMOHook.java
 create mode 100644 UltimateTimber-Adapter/Legacy/Legacy.iml
 create mode 100644 UltimateTimber-Adapter/Legacy/pom.xml
 rename {src/main/java/com/songoda/ultimatetimber/adapter/legacy => UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy}/LegacyAdapter.java (100%)
 rename {src/main/java/com/songoda/ultimatetimber/adapter/legacy => UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy}/LegacyBlockData.java (89%)
 rename src/main/java/com/songoda/ultimatetimber/hooks/JobsHook.java => UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyJobsHook.java (86%)
 rename src/main/java/com/songoda/ultimatetimber/hooks/McMMOHook.java => UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyMcMMOHook.java (89%)
 create mode 100644 UltimateTimber/Core/UltimateTimber-Core.iml
 create mode 100644 UltimateTimber/Core/pom.xml
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/adapter/IBlockData.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/adapter/VersionAdapter.java (98%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/adapter/VersionAdapterType.java (100%)
 rename {src/main/java/com/songoda/ultimatetimber/hooks => UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/hook}/TimberHook.java (86%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/DetectedTree.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java (64%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java (77%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java (78%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/TreeBlockSet.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/TreeBlockType.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/tree/TreeLoot.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/utils/Methods.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/utils/Metrics.java (100%)
 rename {src => UltimateTimber/Core/src}/main/java/com/songoda/ultimatetimber/utils/NMSUtil.java (100%)
 create mode 100644 UltimateTimber/Plugin/UltimateTimber-Plugin.iml
 create mode 100644 UltimateTimber/Plugin/pom.xml
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/UltimateTimber.java (100%)
 rename {src/main/java/com/songoda/ultimatetimber/tree => UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber}/animation/TreeAnimation.java (94%)
 rename {src/main/java/com/songoda/ultimatetimber/tree => UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber}/animation/TreeAnimationChaos.java (91%)
 rename {src/main/java/com/songoda/ultimatetimber/tree => UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber}/animation/TreeAnimationDisintegrate.java (91%)
 rename {src/main/java/com/songoda/ultimatetimber/tree => UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber}/animation/TreeAnimationFancy.java (91%)
 rename {src/main/java/com/songoda/ultimatetimber/tree => UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber}/animation/TreeAnimationNone.java (91%)
 rename {src/main/java/com/songoda/ultimatetimber/tree => UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber}/animation/TreeAnimationType.java (73%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/events/TreeEvent.java (96%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java (95%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java (95%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/ChoppingManager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/CommandManager.java (98%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/ConfigurationManager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/HookManager.java (86%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/Manager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/SaplingManager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/TreeDetectionManager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/manager/TreeFallManager.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/AxeDurability.java (98%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/CustomLoot.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/DefaultConfig.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/EventFilter.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/NoAnimationTreeDestroyer.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/TreeEntityDamage.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/TreeFallAnimation.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/TreeFallListener.java (100%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/TreeLoot.java (96%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/TreeReplant.java (98%)
 rename {src => UltimateTimber/Plugin/src}/main/java/com/songoda/ultimatetimber/old_code/TreeSounds.java (100%)
 create mode 100644 UltimateTimber/Plugin/src/main/main.iml
 rename {src => UltimateTimber/Plugin/src}/main/resources/config-current.yml (100%)
 rename {src => UltimateTimber/Plugin/src}/main/resources/config-legacy.yml (100%)
 rename {src => UltimateTimber/Plugin/src}/main/resources/plugin.yml (100%)
 create mode 100644 pom-old.xml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b4745f..ecca9aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,9 +2,9 @@ stages:
 - build
 
 variables:
-    name: "UltimateTimber"
-    path: "/builds/$CI_PROJECT_PATH"
-    version: "2.0.0"
+  name: "UltimateTimber"
+  path: "/builds/$CI_PROJECT_PATH"
+  version: "2.0.0"
 
 build:
   stage: build
diff --git a/LICENSE b/LICENSE
index 2ddfa07..6505da0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018 Brianna O’Keefe
+Copyright (c) 2019 Brianna O’Keefe
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software with minimal restriction, including the rights to use, copy, modify or merge while excluding the rights to publish, (re)distribute, sub-license, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/UltimateTimber-Adapter/Current/Current.iml b/UltimateTimber-Adapter/Current/Current.iml
new file mode 100644
index 0000000..b7f26fa
--- /dev/null
+++ b/UltimateTimber-Adapter/Current/Current.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.gmail.nossr50:mcmmo:1.5.09" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.gamingmesh:jobs:4.6.0" level="project" />
+    <orderEntry type="module" module-name="UltimateTimber-Core" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/UltimateTimber-Adapter/Current/pom.xml b/UltimateTimber-Adapter/Current/pom.xml
new file mode 100644
index 0000000..174d923
--- /dev/null
+++ b/UltimateTimber-Adapter/Current/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <groupId>com.songoda.ultimatetimber</groupId>
+        <artifactId>UltimateTimber</artifactId>
+        <version>maven-version-number</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>UltimateTimber-CurrentAdapter</artifactId>
+    <packaging>jar</packaging>
+    <version>maven-version-number</version>
+
+    <dependencies>
+        <!--Spigot API-->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.13.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--mcMMO-->
+        <dependency>
+            <groupId>com.gmail.nossr50</groupId>
+            <artifactId>mcmmo</artifactId>
+            <version>1.5.09</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--Jobs Reborn-->
+        <dependency>
+            <groupId>com.gamingmesh</groupId>
+            <artifactId>jobs</artifactId>
+            <version>4.6.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--UltimateTimber-Core Module-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>UltimateTimber-Core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/src/main/java/com/songoda/ultimatetimber/adapter/current/CurrentAdapter.java b/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/CurrentAdapter.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/adapter/current/CurrentAdapter.java
rename to UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/CurrentAdapter.java
diff --git a/src/main/java/com/songoda/ultimatetimber/adapter/current/CurrentBlockData.java b/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/CurrentBlockData.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/adapter/current/CurrentBlockData.java
rename to UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/CurrentBlockData.java
diff --git a/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentJobsHook.java b/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentJobsHook.java
new file mode 100644
index 0000000..f09f432
--- /dev/null
+++ b/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentJobsHook.java
@@ -0,0 +1,33 @@
+package com.songoda.ultimatetimber.adapter.current.hooks;
+
+import com.gamingmesh.jobs.Jobs;
+import com.gamingmesh.jobs.actions.BlockActionInfo;
+import com.gamingmesh.jobs.container.ActionType;
+import com.gamingmesh.jobs.container.JobsPlayer;
+import com.songoda.ultimatetimber.hook.TimberHook;
+import com.songoda.ultimatetimber.tree.ITreeBlock;
+import com.songoda.ultimatetimber.tree.TreeBlockSet;
+import org.bukkit.GameMode;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+public class CurrentJobsHook implements TimberHook {
+
+    @Override
+    public void apply(Player player, TreeBlockSet<Block> treeBlocks) throws Exception {
+        if (player.getGameMode().equals(GameMode.CREATIVE)) 
+            return;
+        
+        // Replicate the same code that Jobs Reborn uses
+        JobsPlayer jPlayer = Jobs.getPlayerManager().getJobsPlayer(player);
+        if (jPlayer == null) 
+            return;
+        
+        for (ITreeBlock<Block> treeBlock : treeBlocks.getLogBlocks()) {
+            Block block = treeBlock.getBlock();
+            BlockActionInfo bInfo = new BlockActionInfo(block, ActionType.BREAK);
+            Jobs.action(jPlayer, bInfo, block);
+        }
+    }
+
+}
diff --git a/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentMcMMOHook.java b/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentMcMMOHook.java
new file mode 100644
index 0000000..5b55b41
--- /dev/null
+++ b/UltimateTimber-Adapter/Current/src/main/java/com.songoda.ultimatetimber.adapter.current/hooks/CurrentMcMMOHook.java
@@ -0,0 +1,60 @@
+package com.songoda.ultimatetimber.adapter.current.hooks;
+
+import com.gmail.nossr50.api.ExperienceAPI;
+import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.songoda.ultimatetimber.hook.TimberHook;
+import com.songoda.ultimatetimber.tree.ITreeBlock;
+import com.songoda.ultimatetimber.tree.TreeBlockSet;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.Method;
+
+public class CurrentMcMMOHook implements TimberHook {
+
+    private Enum<?> woodcuttingEnum;
+    private Method getXpMethod;
+    
+    public CurrentMcMMOHook() throws NoSuchMethodException, SecurityException, ClassNotFoundException {
+        try { // Try to find mcMMO Overhaul
+            Class<?> primarySkillTypeClass = Class.forName("com.gmail.nossr50.datatypes.skills.PrimarySkillType");
+            for (Object enumValue : primarySkillTypeClass.getEnumConstants()) {
+                Enum<?> primarySkillTypeEnum = (Enum<?>) enumValue;
+                if (primarySkillTypeEnum.name().equals("WOODCUTTING")) {
+                    this.woodcuttingEnum = primarySkillTypeEnum;
+                    break;
+                }
+            }
+            this.getXpMethod = ExperienceConfig.class.getMethod("getXp", this.woodcuttingEnum.getClass(), Material.class);
+        } catch (Exception ex) {
+            Class<?> skillTypeClass = Class.forName("com.gmail.nossr50.datatypes.skills.SkillType");
+            for (Object enumValue : skillTypeClass.getEnumConstants()) {
+                Enum<?> skillTypeEnum = (Enum<?>) enumValue;
+                if (skillTypeEnum.name().equals("WOODCUTTING")) {
+                    this.woodcuttingEnum = skillTypeEnum;
+                    break;
+                }
+            }
+            this.getXpMethod = ExperienceConfig.class.getMethod("getXp", this.woodcuttingEnum.getClass(), Material.class);
+        }
+    }
+
+    @Override
+    public void apply(Player player, TreeBlockSet<Block> treeBlocks) throws Exception {
+        if (player.getGameMode().equals(GameMode.CREATIVE)) 
+            return;
+        
+        int xp = 0;
+        for (ITreeBlock<Block> treeBlock : treeBlocks.getLogBlocks()) {
+            Block block = treeBlock.getBlock();
+            Material material = block.getType();
+            if (!material.name().endsWith("LOG")) continue;
+            xp += (int) this.getXpMethod.invoke(ExperienceConfig.getInstance(), this.woodcuttingEnum, material);
+        }
+        
+        ExperienceAPI.addXP(player, "woodcutting", xp, "pve");
+    }
+
+}
diff --git a/UltimateTimber-Adapter/Legacy/Legacy.iml b/UltimateTimber-Adapter/Legacy/Legacy.iml
new file mode 100644
index 0000000..beb09fc
--- /dev/null
+++ b/UltimateTimber-Adapter/Legacy/Legacy.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.12.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.gmail.nossr50:mcmmo:1.5.09" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.gamingmesh:jobs:4.6.0" level="project" />
+    <orderEntry type="module" module-name="UltimateTimber-Core" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/UltimateTimber-Adapter/Legacy/pom.xml b/UltimateTimber-Adapter/Legacy/pom.xml
new file mode 100644
index 0000000..0aa9979
--- /dev/null
+++ b/UltimateTimber-Adapter/Legacy/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <groupId>com.songoda.ultimatetimber</groupId>
+        <artifactId>UltimateTimber</artifactId>
+        <version>maven-version-number</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>UltimateTimber-LegacyAdapter</artifactId>
+    <packaging>jar</packaging>
+    <version>maven-version-number</version>
+
+    <dependencies>
+        <!--Spigot API-->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.12.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--mcMMO-->
+        <dependency>
+            <groupId>com.gmail.nossr50</groupId>
+            <artifactId>mcmmo</artifactId>
+            <version>1.5.09</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--Jobs Reborn-->
+        <dependency>
+            <groupId>com.gamingmesh</groupId>
+            <artifactId>jobs</artifactId>
+            <version>4.6.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--UltimateTimber-Core Module-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>UltimateTimber-Core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/src/main/java/com/songoda/ultimatetimber/adapter/legacy/LegacyAdapter.java b/UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/LegacyAdapter.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/adapter/legacy/LegacyAdapter.java
rename to UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/LegacyAdapter.java
diff --git a/src/main/java/com/songoda/ultimatetimber/adapter/legacy/LegacyBlockData.java b/UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/LegacyBlockData.java
similarity index 89%
rename from src/main/java/com/songoda/ultimatetimber/adapter/legacy/LegacyBlockData.java
rename to UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/LegacyBlockData.java
index 2057e4d..dd5285b 100644
--- a/src/main/java/com/songoda/ultimatetimber/adapter/legacy/LegacyBlockData.java
+++ b/UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/LegacyBlockData.java
@@ -40,8 +40,7 @@ public class LegacyBlockData implements IBlockData {
     @Override
     public void setBlock(Block block) {
         block.setType(this.material);
-        // TODO: Break into maven modules so this can use a 1.12.2 jar for compiling instead
-        // block.setData(this.data);
+        block.setData(this.data);
     }
 
 }
diff --git a/src/main/java/com/songoda/ultimatetimber/hooks/JobsHook.java b/UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyJobsHook.java
similarity index 86%
rename from src/main/java/com/songoda/ultimatetimber/hooks/JobsHook.java
rename to UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyJobsHook.java
index 9f42658..f6cfc6a 100644
--- a/src/main/java/com/songoda/ultimatetimber/hooks/JobsHook.java
+++ b/UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyJobsHook.java
@@ -1,16 +1,17 @@
-package com.songoda.ultimatetimber.hooks;
+package com.songoda.ultimatetimber.adapter.legacy.hooks;
 
 import com.gamingmesh.jobs.Jobs;
 import com.gamingmesh.jobs.actions.BlockActionInfo;
 import com.gamingmesh.jobs.container.ActionType;
 import com.gamingmesh.jobs.container.JobsPlayer;
+import com.songoda.ultimatetimber.hook.TimberHook;
 import com.songoda.ultimatetimber.tree.ITreeBlock;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
 import org.bukkit.GameMode;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
-public class JobsHook implements TimberHook {
+public class LegacyJobsHook implements TimberHook {
 
     @Override
     public void apply(Player player, TreeBlockSet<Block> treeBlocks) throws Exception {
diff --git a/src/main/java/com/songoda/ultimatetimber/hooks/McMMOHook.java b/UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyMcMMOHook.java
similarity index 89%
rename from src/main/java/com/songoda/ultimatetimber/hooks/McMMOHook.java
rename to UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyMcMMOHook.java
index 7aae868..2b5198e 100644
--- a/src/main/java/com/songoda/ultimatetimber/hooks/McMMOHook.java
+++ b/UltimateTimber-Adapter/Legacy/src/main/java/com.songoda.ultimatetimber.adapter.legacy/hooks/LegacyMcMMOHook.java
@@ -1,7 +1,8 @@
-package com.songoda.ultimatetimber.hooks;
+package com.songoda.ultimatetimber.adapter.legacy.hooks;
 
 import com.gmail.nossr50.api.ExperienceAPI;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.songoda.ultimatetimber.hook.TimberHook;
 import com.songoda.ultimatetimber.tree.ITreeBlock;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
 import org.bukkit.GameMode;
@@ -11,12 +12,12 @@ import org.bukkit.entity.Player;
 
 import java.lang.reflect.Method;
 
-public class McMMOHook implements TimberHook {
+public class LegacyMcMMOHook implements TimberHook {
 
     private Enum<?> woodcuttingEnum;
     private Method getXpMethod;
     
-    public McMMOHook() throws NoSuchMethodException, SecurityException, ClassNotFoundException {
+    public LegacyMcMMOHook() throws NoSuchMethodException, SecurityException, ClassNotFoundException {
         try { // Try to find mcMMO Overhaul
             Class<?> primarySkillTypeClass = Class.forName("com.gmail.nossr50.datatypes.skills.PrimarySkillType");
             for (Object enumValue : primarySkillTypeClass.getEnumConstants()) {
diff --git a/UltimateTimber/Core/UltimateTimber-Core.iml b/UltimateTimber/Core/UltimateTimber-Core.iml
new file mode 100644
index 0000000..92ab375
--- /dev/null
+++ b/UltimateTimber/Core/UltimateTimber-Core.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13.2" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/UltimateTimber/Core/pom.xml b/UltimateTimber/Core/pom.xml
new file mode 100644
index 0000000..febfd60
--- /dev/null
+++ b/UltimateTimber/Core/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <groupId>com.songoda.ultimatetimber</groupId>
+        <artifactId>UltimateTimber</artifactId>
+        <version>maven-version-number</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>UltimateTimber-Core</artifactId>
+    <packaging>jar</packaging>
+    <version>maven-version-number</version>
+
+    <dependencies>
+        <!--Spigot API-->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.13.2</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/src/main/java/com/songoda/ultimatetimber/adapter/IBlockData.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/adapter/IBlockData.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/adapter/IBlockData.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/adapter/IBlockData.java
diff --git a/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapter.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapter.java
similarity index 98%
rename from src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapter.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapter.java
index 34ee3f6..bdd75eb 100644
--- a/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapter.java
+++ b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapter.java
@@ -5,7 +5,6 @@ import com.songoda.ultimatetimber.tree.TreeBlock;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Collection;
diff --git a/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapterType.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapterType.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapterType.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/adapter/VersionAdapterType.java
diff --git a/src/main/java/com/songoda/ultimatetimber/hooks/TimberHook.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/hook/TimberHook.java
similarity index 86%
rename from src/main/java/com/songoda/ultimatetimber/hooks/TimberHook.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/hook/TimberHook.java
index 8b3c0c9..148c520 100644
--- a/src/main/java/com/songoda/ultimatetimber/hooks/TimberHook.java
+++ b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/hook/TimberHook.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatetimber.hooks;
+package com.songoda.ultimatetimber.hook;
 
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
 import org.bukkit.block.Block;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/DetectedTree.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/DetectedTree.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/tree/DetectedTree.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/DetectedTree.java
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
similarity index 64%
rename from src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
index c8d9c58..3b07962 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
+++ b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/FallingTreeBlock.java
@@ -1,6 +1,5 @@
 package com.songoda.ultimatetimber.tree;
 
-import com.songoda.ultimatetimber.UltimateTimber;
 import org.bukkit.Location;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.inventory.ItemStack;
@@ -11,12 +10,10 @@ public class FallingTreeBlock implements ITreeBlock<FallingBlock> {
 
     private final FallingBlock fallingBlock;
     private final TreeBlockType treeBlockType;
-    private final Collection<ItemStack> drops;
 
-    public FallingTreeBlock(TreeBlock originalTreeBlock, FallingBlock fallingBlock, TreeBlockType treeBlockType) {
+    public FallingTreeBlock(FallingBlock fallingBlock, TreeBlockType treeBlockType) {
         this.fallingBlock = fallingBlock;
         this.treeBlockType = treeBlockType;
-        this.drops = UltimateTimber.getInstance().getVersionAdapter().getBlockDrops(originalTreeBlock);
     }
 
     @Override
@@ -29,11 +26,6 @@ public class FallingTreeBlock implements ITreeBlock<FallingBlock> {
         return this.fallingBlock.getLocation();
     }
 
-    @Override
-    public Collection<ItemStack> getDrops() {
-        return this.drops;
-    }
-
     @Override
     public TreeBlockType getTreeBlockType() {
         return this.treeBlockType;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java
similarity index 77%
rename from src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java
index 63c98f9..077d5ab 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java
+++ b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/ITreeBlock.java
@@ -21,13 +21,6 @@ public interface ITreeBlock<BlockType> {
      */
     Location getLocation();
 
-    /**
-     * Gets the items this TreeBlock naturally drops
-     *
-     * @return The ItemStack this TreeBlock naturally drops
-     */
-    Collection<ItemStack> getDrops();
-
     /**
      * Gets what type of TreeBlock this is
      *
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java
similarity index 78%
rename from src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java
index e7ff79e..197e866 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java
+++ b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeBlock.java
@@ -1,6 +1,5 @@
 package com.songoda.ultimatetimber.tree;
 
-import com.songoda.ultimatetimber.UltimateTimber;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
@@ -27,11 +26,6 @@ public class TreeBlock implements ITreeBlock<Block> {
         return this.block.getLocation();
     }
 
-    @Override
-    public Collection<ItemStack> getDrops() {
-        return UltimateTimber.getInstance().getVersionAdapter().getBlockDrops(this);
-    }
-
     @Override
     public TreeBlockType getTreeBlockType() {
         return this.treeBlockType;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockSet.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockSet.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/tree/TreeBlockSet.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockSet.java
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockType.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockType.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/tree/TreeBlockType.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeBlockType.java
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeDefinition.java
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/TreeLoot.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeLoot.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/tree/TreeLoot.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/tree/TreeLoot.java
diff --git a/src/main/java/com/songoda/ultimatetimber/utils/Methods.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/utils/Methods.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/utils/Methods.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/utils/Methods.java
diff --git a/src/main/java/com/songoda/ultimatetimber/utils/Metrics.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/utils/Metrics.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/utils/Metrics.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/utils/Metrics.java
diff --git a/src/main/java/com/songoda/ultimatetimber/utils/NMSUtil.java b/UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/utils/NMSUtil.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/utils/NMSUtil.java
rename to UltimateTimber/Core/src/main/java/com/songoda/ultimatetimber/utils/NMSUtil.java
diff --git a/UltimateTimber/Plugin/UltimateTimber-Plugin.iml b/UltimateTimber/Plugin/UltimateTimber-Plugin.iml
new file mode 100644
index 0000000..07fb891
--- /dev/null
+++ b/UltimateTimber/Plugin/UltimateTimber-Plugin.iml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13.2" level="project" />
+    <orderEntry type="module" module-name="UltimateTimber-Core" />
+    <orderEntry type="module" module-name="Current" />
+    <orderEntry type="module" module-name="Legacy" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml
new file mode 100644
index 0000000..d85051a
--- /dev/null
+++ b/UltimateTimber/Plugin/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <groupId>com.songoda.ultimatetimber</groupId>
+        <artifactId>UltimateTimber</artifactId>
+        <version>maven-version-number</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>UltimateTimber-Plugin</artifactId>
+    <packaging>jar</packaging>
+    <version>maven-version-number</version>
+
+    <dependencies>
+        <!--Spigot API-->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.13.2</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--UltimateTimber-Core Module-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>UltimateTimber-Core</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--UltimateTimber-CurrentAdapter Module-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>UltimateTimber-CurrentAdapter</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--UltimateTimber-LegacyAdapter Module-->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>UltimateTimber-LegacyAdapter</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${parent.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
+                <configuration>
+                    <showDeprecation>false</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/UltimateTimber.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/UltimateTimber.java
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimation.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimation.java
similarity index 94%
rename from src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimation.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimation.java
index 371a31f..78b74d9 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimation.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimation.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatetimber.tree.animation;
+package com.songoda.ultimatetimber.animation;
 
 import com.songoda.ultimatetimber.tree.DetectedTree;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationChaos.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationChaos.java
similarity index 91%
rename from src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationChaos.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationChaos.java
index bd34e01..6eaa528 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationChaos.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationChaos.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatetimber.tree.animation;
+package com.songoda.ultimatetimber.animation;
 
 import com.songoda.ultimatetimber.tree.DetectedTree;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationDisintegrate.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java
similarity index 91%
rename from src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationDisintegrate.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java
index 550fafd..ecac889 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationDisintegrate.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationDisintegrate.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatetimber.tree.animation;
+package com.songoda.ultimatetimber.animation;
 
 import com.songoda.ultimatetimber.tree.DetectedTree;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationFancy.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationFancy.java
similarity index 91%
rename from src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationFancy.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationFancy.java
index 5c6e6cc..df9cecd 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationFancy.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationFancy.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatetimber.tree.animation;
+package com.songoda.ultimatetimber.animation;
 
 import com.songoda.ultimatetimber.tree.DetectedTree;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationNone.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationNone.java
similarity index 91%
rename from src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationNone.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationNone.java
index 2f6629e..85f0602 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationNone.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationNone.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatetimber.tree.animation;
+package com.songoda.ultimatetimber.animation;
 
 import com.songoda.ultimatetimber.tree.DetectedTree;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
diff --git a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationType.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationType.java
similarity index 73%
rename from src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationType.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationType.java
index 8b8eb76..3047fce 100644
--- a/src/main/java/com/songoda/ultimatetimber/tree/animation/TreeAnimationType.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/animation/TreeAnimationType.java
@@ -1,4 +1,4 @@
-package com.songoda.ultimatetimber.tree.animation;
+package com.songoda.ultimatetimber.animation;
 
 /**
  * The types of tree animations that are available
diff --git a/src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java
similarity index 96%
rename from src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java
index 434d91e..6ab83ed 100644
--- a/src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeEvent.java
@@ -1,28 +1,28 @@
-package com.songoda.ultimatetimber.events;
-
-import com.songoda.ultimatetimber.tree.DetectedTree;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerEvent;
-
-/**
- * Abstract tree event containing tree's blocks and broke block
- */
-public abstract class TreeEvent extends PlayerEvent {
-	
-	protected final DetectedTree detectedTree;
-
-    public TreeEvent(Player player, DetectedTree detectedTree) {
-        super(player);
-        this.detectedTree = detectedTree;
-    }
-
-    /**
-     * Get the tree blocks
-     * 
-     * @return The blocks that are part of the tree
-     */
-    public DetectedTree getDetectedTree() {
-        return this.detectedTree;
-    }
-    
-}
+package com.songoda.ultimatetimber.events;
+
+import com.songoda.ultimatetimber.tree.DetectedTree;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerEvent;
+
+/**
+ * Abstract tree event containing tree's blocks and broke block
+ */
+public abstract class TreeEvent extends PlayerEvent {
+	
+	protected final DetectedTree detectedTree;
+
+    public TreeEvent(Player player, DetectedTree detectedTree) {
+        super(player);
+        this.detectedTree = detectedTree;
+    }
+
+    /**
+     * Get the tree blocks
+     * 
+     * @return The blocks that are part of the tree
+     */
+    public DetectedTree getDetectedTree() {
+        return this.detectedTree;
+    }
+    
+}
diff --git a/src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java
similarity index 95%
rename from src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java
index 57b44b0..4923b32 100644
--- a/src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeFallEvent.java
@@ -1,40 +1,40 @@
-package com.songoda.ultimatetimber.events;
-
-import com.songoda.ultimatetimber.tree.DetectedTree;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-
-/**
- * Called when a tree will fall
- */
-public class TreeFallEvent extends TreeEvent implements Cancellable {
-	
-	private boolean cancelled = false;
-	
-    public TreeFallEvent(Player player, DetectedTree detectedTree) {
-        super(player, detectedTree);
-    }
-
-    private static final HandlerList handlers = new HandlerList();
-    
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    @Override
-	public boolean isCancelled() {
-		return cancelled;
-	}
-
-	@Override
-	public void setCancelled(boolean cancelled) {
-		this.cancelled = cancelled;
-	}
-	
-}
+package com.songoda.ultimatetimber.events;
+
+import com.songoda.ultimatetimber.tree.DetectedTree;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Called when a tree will fall
+ */
+public class TreeFallEvent extends TreeEvent implements Cancellable {
+	
+	private boolean cancelled = false;
+	
+    public TreeFallEvent(Player player, DetectedTree detectedTree) {
+        super(player, detectedTree);
+    }
+
+    private static final HandlerList handlers = new HandlerList();
+    
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @Override
+	public boolean isCancelled() {
+		return cancelled;
+	}
+
+	@Override
+	public void setCancelled(boolean cancelled) {
+		this.cancelled = cancelled;
+	}
+	
+}
diff --git a/src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java
similarity index 95%
rename from src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java
index 8eda83f..cfe94d5 100644
--- a/src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/events/TreeFellEvent.java
@@ -1,27 +1,27 @@
-package com.songoda.ultimatetimber.events;
-
-import com.songoda.ultimatetimber.tree.DetectedTree;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-
-/**
- * Called when a tree fell
- */
-public class TreeFellEvent extends TreeEvent {
-
-    public TreeFellEvent(Player player, DetectedTree detectedTree) {
-        super(player, detectedTree);
-    }
-
-    private static final HandlerList handlers = new HandlerList();
-    
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-	
-}
+package com.songoda.ultimatetimber.events;
+
+import com.songoda.ultimatetimber.tree.DetectedTree;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Called when a tree fell
+ */
+public class TreeFellEvent extends TreeEvent {
+
+    public TreeFellEvent(Player player, DetectedTree detectedTree) {
+        super(player, detectedTree);
+    }
+
+    private static final HandlerList handlers = new HandlerList();
+    
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+	
+}
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/ChoppingManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/ChoppingManager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/ChoppingManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/ChoppingManager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/CommandManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/CommandManager.java
similarity index 98%
rename from src/main/java/com/songoda/ultimatetimber/manager/CommandManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/CommandManager.java
index 560d2da..5f7b18c 100644
--- a/src/main/java/com/songoda/ultimatetimber/manager/CommandManager.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/CommandManager.java
@@ -1,7 +1,7 @@
 package com.songoda.ultimatetimber.manager;
 
 import com.songoda.ultimatetimber.UltimateTimber;
-import com.songoda.ultimatetimber.utils.Methods;
+import utils.Methods;
 import org.bukkit.command.*;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/ConfigurationManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/ConfigurationManager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/ConfigurationManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/ConfigurationManager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java
similarity index 86%
rename from src/main/java/com/songoda/ultimatetimber/manager/HookManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java
index 6707afa..9c1d916 100644
--- a/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/HookManager.java
@@ -1,9 +1,9 @@
 package com.songoda.ultimatetimber.manager;
 
 import com.songoda.ultimatetimber.UltimateTimber;
-import com.songoda.ultimatetimber.hooks.JobsHook;
-import com.songoda.ultimatetimber.hooks.McMMOHook;
-import com.songoda.ultimatetimber.hooks.TimberHook;
+import com.songoda.ultimatetimber.adapter.current.hooks.CurrentJobsHook;
+import com.songoda.ultimatetimber.adapter.current.hooks.CurrentMcMMOHook;
+import com.songoda.ultimatetimber.hook.TimberHook;
 import com.songoda.ultimatetimber.tree.TreeBlockSet;
 import org.bukkit.Bukkit;
 import org.bukkit.block.Block;
@@ -25,8 +25,8 @@ public class HookManager extends Manager {
     public void reload() {
         this.hooks.clear();
 
-        this.tryHook("mcMMO", McMMOHook.class);
-        this.tryHook("Jobs", JobsHook.class);
+        this.tryHook("mcMMO", CurrentMcMMOHook.class);
+        this.tryHook("Jobs", CurrentJobsHook.class);
     }
 
     @Override
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/Manager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/Manager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/Manager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/Manager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/SaplingManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/SaplingManager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/SaplingManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/SaplingManager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeAnimationManager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/TreeDetectionManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeDetectionManager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/TreeDetectionManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeDetectionManager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/manager/TreeFallManager.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeFallManager.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/manager/TreeFallManager.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/manager/TreeFallManager.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/AxeDurability.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/AxeDurability.java
similarity index 98%
rename from src/main/java/com/songoda/ultimatetimber/old_code/AxeDurability.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/AxeDurability.java
index f2ec201..db00d94 100644
--- a/src/main/java/com/songoda/ultimatetimber/old_code/AxeDurability.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/AxeDurability.java
@@ -1,6 +1,5 @@
 package com.songoda.ultimatetimber.old_code;
 
-import com.songoda.ultimatetimber.utils.WoodToLogConverter;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/CustomLoot.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/CustomLoot.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/CustomLoot.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/CustomLoot.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/DefaultConfig.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/DefaultConfig.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/DefaultConfig.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/DefaultConfig.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/EventFilter.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/EventFilter.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/EventFilter.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/EventFilter.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/NoAnimationTreeDestroyer.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/NoAnimationTreeDestroyer.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/NoAnimationTreeDestroyer.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/NoAnimationTreeDestroyer.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/TreeEntityDamage.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeEntityDamage.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/TreeEntityDamage.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeEntityDamage.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/TreeFallAnimation.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeFallAnimation.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/TreeFallAnimation.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeFallAnimation.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/TreeFallListener.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeFallListener.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/TreeFallListener.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeFallListener.java
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/TreeLoot.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeLoot.java
similarity index 96%
rename from src/main/java/com/songoda/ultimatetimber/old_code/TreeLoot.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeLoot.java
index 67ae728..bd71ece 100644
--- a/src/main/java/com/songoda/ultimatetimber/old_code/TreeLoot.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeLoot.java
@@ -1,7 +1,7 @@
 package com.songoda.ultimatetimber.old_code;
 
-import com.songoda.ultimatetimber.utils.LeafToSaplingConverter;
-import com.songoda.ultimatetimber.utils.WoodToLogConverter;
+import utils.LeafToSaplingConverter;
+import utils.WoodToLogConverter;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/TreeReplant.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeReplant.java
similarity index 98%
rename from src/main/java/com/songoda/ultimatetimber/old_code/TreeReplant.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeReplant.java
index b04d7ce..f6190c6 100644
--- a/src/main/java/com/songoda/ultimatetimber/old_code/TreeReplant.java
+++ b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeReplant.java
@@ -1,7 +1,7 @@
 package com.songoda.ultimatetimber.old_code;
 
 import com.songoda.ultimatetimber.UltimateTimber;
-import com.songoda.ultimatetimber.utils.WoodToLogConverter;
+import utils.WoodToLogConverter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
diff --git a/src/main/java/com/songoda/ultimatetimber/old_code/TreeSounds.java b/UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeSounds.java
similarity index 100%
rename from src/main/java/com/songoda/ultimatetimber/old_code/TreeSounds.java
rename to UltimateTimber/Plugin/src/main/java/com/songoda/ultimatetimber/old_code/TreeSounds.java
diff --git a/UltimateTimber/Plugin/src/main/main.iml b/UltimateTimber/Plugin/src/main/main.iml
new file mode 100644
index 0000000..908ad4f
--- /dev/null
+++ b/UltimateTimber/Plugin/src/main/main.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/main/resources/config-current.yml b/UltimateTimber/Plugin/src/main/resources/config-current.yml
similarity index 100%
rename from src/main/resources/config-current.yml
rename to UltimateTimber/Plugin/src/main/resources/config-current.yml
diff --git a/src/main/resources/config-legacy.yml b/UltimateTimber/Plugin/src/main/resources/config-legacy.yml
similarity index 100%
rename from src/main/resources/config-legacy.yml
rename to UltimateTimber/Plugin/src/main/resources/config-legacy.yml
diff --git a/src/main/resources/plugin.yml b/UltimateTimber/Plugin/src/main/resources/plugin.yml
similarity index 100%
rename from src/main/resources/plugin.yml
rename to UltimateTimber/Plugin/src/main/resources/plugin.yml
diff --git a/pom-old.xml b/pom-old.xml
new file mode 100644
index 0000000..8679b2b
--- /dev/null
+++ b/pom-old.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>ultimatetimber</groupId>
+    <artifactId>UltimateTimber</artifactId>
+    <version>maven-version-number</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <finalName>UltimateTimber-${project.version}</finalName>
+        <defaultGoal>clean resources:resources package</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.2</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>${project.build.directory}/classes/plugin.yml</file>
+                    <replacements>
+                        <replacement>
+                            <token>maven-version-number</token>
+                            <value>${project.version}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+        	<id>songoda-repo</id>
+        	<url>http://repo.songoda.com/artifactory/private</url>
+        </repository>
+    </repositories>
+    <dependencies>
+        <!--Spigot API-->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--Bukkit API-->
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!--mcMMO-->
+        <dependency>
+        	<groupId>com.gmail.nossr50</groupId>
+        	<artifactId>mcmmo</artifactId>
+        	<version>1.5.09</version>
+        	<scope>provided</scope>
+        </dependency>
+        <!--Jobs Reborn-->
+        <dependency>
+        	<groupId>com.gamingmesh</groupId>
+        	<artifactId>jobs</artifactId>
+        	<version>4.6.0</version>
+        	<scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 8679b2b..37fb340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,17 +4,24 @@
          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>ultimatetimber</groupId>
+    <groupId>com.songoda.ultimatetimber</groupId>
     <artifactId>UltimateTimber</artifactId>
+    <packaging>pom</packaging>
     <version>maven-version-number</version>
 
+    <modules>
+        <module>UltimateTimber-Adapter/Current</module>
+        <module>UltimateTimber-Adapter/Legacy</module>
+        <module>UltimateTimber/Core</module>
+        <module>UltimateTimber/Plugin</module>
+    </modules>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <build>
-        <finalName>UltimateTimber-${project.version}</finalName>
-        <defaultGoal>clean resources:resources package</defaultGoal>
+        <defaultGoal>clean install</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -25,70 +32,13 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <version>1.5.3</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>${project.build.directory}/classes/plugin.yml</file>
-                    <replacements>
-                        <replacement>
-                            <token>maven-version-number</token>
-                            <value>${project.version}</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
     <repositories>
         <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-        	<id>songoda-repo</id>
-        	<url>http://repo.songoda.com/artifactory/private</url>
+            <id>songoda-repo</id>
+            <url>http://repo.songoda.com/artifactory/private</url>
         </repository>
     </repositories>
-    <dependencies>
-        <!--Spigot API-->
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!--Bukkit API-->
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!--mcMMO-->
-        <dependency>
-        	<groupId>com.gmail.nossr50</groupId>
-        	<artifactId>mcmmo</artifactId>
-        	<version>1.5.09</version>
-        	<scope>provided</scope>
-        </dependency>
-        <!--Jobs Reborn-->
-        <dependency>
-        	<groupId>com.gamingmesh</groupId>
-        	<artifactId>jobs</artifactId>
-        	<version>4.6.0</version>
-        	<scope>provided</scope>
-        </dependency>
-    </dependencies>
-
 </project>