diff --git a/build.gradle b/build.gradle
index 4aabdd4..7d3a251 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,11 @@
-import io.papermc.hangarpublishplugin.model.Platforms
-
 plugins {
-    alias(libs.plugins.hangar)
-    alias(libs.plugins.modrinth)
-
     id 'java-library'
 }
 
 defaultTasks 'build'
 
-def combineJars = tasks.register("combineJars", org.gradle.jvm.tasks.Jar) {
-    mustRunAfter build
-
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-
-    from(files(subprojects.findAll { it.name != 'webmap' }.collect {
-        it.layout.buildDirectory.file("libs/${rootProject.name}-${it.name}-${it.version}.jar").get()
-    }).filter { it.name != 'MANIFEST.MF' }.collect { if (it.isDirectory()) it else zipTree(it) })
+assemble {
+    subprojects.forEach { project -> dependsOn ":${project.name}:build" }
 
     doLast {
         File dir = new File(rootDir, "jars")
@@ -26,18 +15,12 @@ def combineJars = tasks.register("combineJars", org.gradle.jvm.tasks.Jar) {
         dir.mkdirs()
 
         copy {
-            from(layout.buildDirectory.file("libs/${rootProject.name}-${rootProject.version}.jar"))
+            from(project("paper").layout.buildDirectory.file("libs/${rootProject.name}-${rootProject.version}.jar").get())
             into(dir)
         }
     }
 }
 
-assemble {
-    subprojects.forEach { project -> dependsOn ":${project.name}:build" }
-
-    finalizedBy combineJars
-}
-
 subprojects {
     apply plugin: 'java-library'
 
@@ -73,68 +56,4 @@ subprojects {
     processResources {
         filteringCharset = 'UTF-8'
     }
-}
-
-boolean isBeta = true
-String modrinthType = isBeta ? "beta" : "release"
-String hangarType = isBeta ? "Beta" : "Release"
-
-String description = """
-# Please take backups and report any bugs you find!
-
-## Changes:
- * Add missing player names for the ah view <player> command
-
-## Fixes:
- * Fix tab complete order
-
-## Other:
- * [Feature Requests](https://github.com/Crazy-Crew/${rootProject.name}/issues)
- * [Bug Reports](https://github.com/Crazy-Crew/${rootProject.name}/issues)
-"""
-
-File file = layout.buildDirectory.file("libs/${rootProject.name}-${rootProject.version}.jar").get().asFile
-
-modrinth {
-    setAutoAddDependsOn(false)
-
-    token.set(System.getenv("modrinth_token"))
-
-    projectId.set(rootProject.name.toLowerCase())
-
-    versionName.set("${rootProject.name} ${rootProject.version}")
-
-    versionNumber.set("${rootProject.version}")
-
-    versionType.set(modrinthType)
-
-    uploadFile.set(file)
-
-    gameVersions.add(minecraftVersion)
-
-    changelog.set(description)
-
-    loaders.addAll("paper", "purpur")
-}
-
-hangarPublish {
-    publications.register("plugin") {
-        version.set("$rootProject.version")
-
-        id.set(rootProject.name)
-
-        channel.set(hangarType)
-
-        changelog.set(description)
-
-        apiKey.set(System.getenv("hangar_key"))
-
-        platforms {
-            register(Platforms.PAPER) {
-                jar.set(file)
-
-                platformVersions.set(["$minecraftVersion"])
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 0575eb0..2f0056a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,8 @@ issues = https://github.com/Crazy-Crew/CrazyAuctions/issues
 
 group = com.badbones69.crazyauctions
 description = Auction off items in style.
-version = 1.3.1
+version = 1.3.2
 apiVersion = 1.20
 
-minecraftVersion = 1.20.2
\ No newline at end of file
+minecraftVersion = 1.20.2
+isBeta = true
\ No newline at end of file
diff --git a/paper/build.gradle b/paper/build.gradle
index efb5e47..8c0034f 100644
--- a/paper/build.gradle
+++ b/paper/build.gradle
@@ -1,15 +1,18 @@
+import io.papermc.hangarpublishplugin.model.Platforms
+
 plugins {
     alias(libs.plugins.paperweight)
     alias(libs.plugins.shadowjar)
 
+    alias(libs.plugins.modrinth)
+
     alias(libs.plugins.runpaper)
+
+    alias(libs.plugins.hangar)
 }
 
-project.group = "${rootProject.group}.paper"
-project.version = rootProject.version
-
 base {
-    archivesName = "${rootProject.name}-${project.name}"
+    archivesName = "${rootProject.name}"
 }
 
 dependencies {
@@ -20,8 +23,68 @@ dependencies {
     paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:$minecraftVersion-R0.1-SNAPSHOT")
 }
 
+String type = isBeta ? "Beta" : "Release"
+
+String description = """
+## Fixes:
+ * Fix not being able to buy items
+ * Fix an issue where it would scream about tasks needing to be run sync
+
+## Other:
+ * [Feature Requests](https://github.com/Crazy-Crew/${rootProject.name}/issues)
+ * [Bug Reports](https://github.com/Crazy-Crew/${rootProject.name}/issues)
+"""
+
+File file = project.layout.buildDirectory.file("libs/${rootProject.name}-${rootProject.version}.jar").get().asFile
+
 tasks {
     runServer {
+        // Publish to hangar.papermc.io.
+        hangarPublish {
+            publications.register("plugin") {
+                version.set("$rootProject.version")
+
+                id.set(rootProject.name)
+
+                channel.set(type)
+
+                changelog.set(description)
+
+                apiKey.set(System.getenv("hangar_key"))
+
+                platforms {
+                    register(Platforms.PAPER) {
+                        jar.set(file)
+
+                        platformVersions.set(["$minecraftVersion"])
+                    }
+                }
+            }
+        }
+
+        // Publish to modrinth.
+        modrinth {
+            setAutoAddDependsOn(false)
+
+            token.set(System.getenv("modrinth_token"))
+
+            projectId.set(rootProject.name.toLowerCase())
+
+            versionName.set("${rootProject.name} ${rootProject.version}")
+
+            versionNumber.set("${rootProject.version}")
+
+            versionType.set(type.toLowerCase())
+
+            uploadFile.set(file)
+
+            gameVersions.add(minecraftVersion)
+
+            changelog.set(description)
+
+            loaders.addAll("paper", "purpur")
+        }
+
         jvmArgs("-Dnet.kyori.ansi.colorLevel=truecolor")
 
         minecraftVersion(minecraftVersion)
diff --git a/paper/run/bukkit.yml b/paper/run/bukkit.yml
new file mode 100644
index 0000000..e0be9fa
--- /dev/null
+++ b/paper/run/bukkit.yml
@@ -0,0 +1,32 @@
+settings:
+  allow-end: false
+  warn-on-overload: false
+  permissions-file: permissions.yml
+  update-folder: update
+  plugin-profiling: false
+  connection-throttle: 4000
+  query-plugins: false
+  deprecated-verbose: default
+  shutdown-message: Server Closed
+  minimum-api: none
+  use-map-color-cache: true
+spawn-limits:
+  monsters: 70
+  animals: 10
+  water-animals: 5
+  water-ambient: 20
+  water-underground-creature: 5
+  axolotls: 5
+  ambient: 15
+chunk-gc:
+  period-in-ticks: 600
+ticks-per:
+  animal-spawns: 400
+  monster-spawns: 1
+  water-spawns: 1
+  water-ambient-spawns: 1
+  water-underground-creature-spawns: 1
+  axolotl-spawns: 1
+  ambient-spawns: 1
+  autosave: 6000
+aliases: now-in-commands.yml
diff --git a/paper/run/config/paper-global.yml b/paper/run/config/paper-global.yml
new file mode 100644
index 0000000..6ccbc81
--- /dev/null
+++ b/paper/run/config/paper-global.yml
@@ -0,0 +1,129 @@
+# This is the global configuration file for Paper.
+# As you can see, there's a lot to configure. Some options may impact gameplay, so use
+# with caution, and make sure you know what each option does before configuring.
+# 
+# If you need help with the configuration or have any questions related to Paper,
+# join us in our Discord or check the docs page.
+# 
+# The world configuration options have been moved inside
+# their respective world folder. The files are named paper-world.yml
+# 
+# Docs: https://docs.papermc.io/
+# Discord: https://discord.gg/papermc
+# Website: https://papermc.io/
+
+_version: 29
+block-updates:
+  disable-chorus-plant-updates: false
+  disable-mushroom-block-updates: false
+  disable-noteblock-updates: false
+  disable-tripwire-updates: false
+chunk-loading-advanced:
+  auto-config-send-distance: true
+  player-max-concurrent-chunk-generates: 0
+  player-max-concurrent-chunk-loads: 0
+chunk-loading-basic:
+  player-max-chunk-generate-rate: -1.0
+  player-max-chunk-load-rate: 100.0
+  player-max-chunk-send-rate: 75.0
+chunk-system:
+  gen-parallelism: default
+  io-threads: -1
+  worker-threads: -1
+collisions:
+  enable-player-collisions: true
+  send-full-pos-for-hard-colliding-entities: true
+commands:
+  fix-target-selector-tag-completion: true
+  suggest-player-names-when-null-tab-completions: true
+  time-command-affects-all-worlds: false
+console:
+  enable-brigadier-completions: true
+  enable-brigadier-highlighting: true
+  has-all-permissions: false
+item-validation:
+  book:
+    author: 8192
+    page: 16384
+    title: 8192
+  book-size:
+    page-max: 2560
+    total-multiplier: 0.98
+  display-name: 8192
+  lore-line: 8192
+  resolve-selectors-in-books: false
+logging:
+  deobfuscate-stacktraces: true
+messages:
+  kick:
+    authentication-servers-down: <lang:multiplayer.disconnect.authservers_down>
+    connection-throttle: Connection throttled! Please wait before reconnecting.
+    flying-player: <lang:multiplayer.disconnect.flying>
+    flying-vehicle: <lang:multiplayer.disconnect.flying>
+  no-permission: <red>I'm sorry, but you do not have permission to perform this command.
+    Please contact the server administrators if you believe that this is in error.
+  use-display-name-in-quit-message: false
+misc:
+  chat-threads:
+    chat-executor-core-size: -1
+    chat-executor-max-size: -1
+  compression-level: default
+  fix-entity-position-desync: true
+  load-permissions-yml-before-plugins: true
+  max-joins-per-tick: 5
+  region-file-cache-size: 256
+  strict-advancement-dimension-check: false
+  use-alternative-luck-formula: false
+  use-dimension-type-for-custom-spawners: false
+packet-limiter:
+  all-packets:
+    action: KICK
+    interval: 7.0
+    max-packet-rate: 500.0
+  kick-message: <red><lang:disconnect.exceeded_packet_rate>
+  overrides:
+    ServerboundPlaceRecipePacket:
+      action: DROP
+      interval: 4.0
+      max-packet-rate: 5.0
+player-auto-save:
+  max-per-tick: -1
+  rate: -1
+proxies:
+  bungee-cord:
+    online-mode: false
+  proxy-protocol: false
+  velocity:
+    enabled: false
+    online-mode: false
+    secret: ''
+scoreboards:
+  save-empty-scoreboard-teams: false
+  track-plugin-scoreboards: false
+spam-limiter:
+  incoming-packet-threshold: 300
+  recipe-spam-increment: 1
+  recipe-spam-limit: 20
+  tab-spam-increment: 1
+  tab-spam-limit: 500
+timings:
+  enabled: false
+  hidden-config-entries:
+  - database
+  - proxies.velocity.secret
+  history-interval: 300
+  history-length: 3600
+  server-name: Unknown Server
+  server-name-privacy: false
+  url: https://timings.aikar.co/
+  verbose: false
+unsupported-settings:
+  allow-grindstone-overstacking: false
+  allow-headless-pistons: false
+  allow-permanent-block-break-exploits: false
+  allow-piston-duplication: false
+  compression-format: ZLIB
+  perform-username-validation: true
+watchdog:
+  early-warning-delay: 10000
+  early-warning-every: 5000
diff --git a/paper/run/config/paper-world-defaults.yml b/paper/run/config/paper-world-defaults.yml
new file mode 100644
index 0000000..91b8756
--- /dev/null
+++ b/paper/run/config/paper-world-defaults.yml
@@ -0,0 +1,302 @@
+# This is the world defaults configuration file for Paper.
+# As you can see, there's a lot to configure. Some options may impact gameplay, so use
+# with caution, and make sure you know what each option does before configuring.
+# 
+# If you need help with the configuration or have any questions related to Paper,
+# join us in our Discord or check the docs page.
+# 
+# Configuration options here apply to all worlds, unless you specify overrides inside
+# the world-specific config file inside each world folder.
+# 
+# Docs: https://docs.papermc.io/
+# Discord: https://discord.gg/papermc
+# Website: https://papermc.io/
+
+_version: 30
+anticheat:
+  anti-xray:
+    enabled: false
+    engine-mode: 1
+    hidden-blocks:
+    - copper_ore
+    - deepslate_copper_ore
+    - gold_ore
+    - deepslate_gold_ore
+    - iron_ore
+    - deepslate_iron_ore
+    - coal_ore
+    - deepslate_coal_ore
+    - lapis_ore
+    - deepslate_lapis_ore
+    - mossy_cobblestone
+    - obsidian
+    - chest
+    - diamond_ore
+    - deepslate_diamond_ore
+    - redstone_ore
+    - deepslate_redstone_ore
+    - clay
+    - emerald_ore
+    - deepslate_emerald_ore
+    - ender_chest
+    lava-obscures: false
+    max-block-height: 64
+    replacement-blocks:
+    - stone
+    - oak_planks
+    - deepslate
+    update-radius: 2
+    use-permission: false
+  obfuscation:
+    items:
+      hide-durability: false
+      hide-itemmeta: false
+      hide-itemmeta-with-visual-effects: false
+chunks:
+  auto-save-interval: default
+  delay-chunk-unloads-by: 10s
+  entity-per-chunk-save-limit:
+    arrow: -1
+    ender_pearl: -1
+    experience_orb: -1
+    fireball: -1
+    small_fireball: -1
+    snowball: -1
+  fixed-chunk-inhabited-time: -1
+  flush-regions-on-save: false
+  max-auto-save-chunks-per-tick: 24
+  prevent-moving-into-unloaded-chunks: false
+collisions:
+  allow-player-cramming-damage: false
+  allow-vehicle-collisions: true
+  fix-climbing-bypassing-cramming-rule: false
+  max-entity-collisions: 8
+  only-players-collide: false
+entities:
+  armor-stands:
+    do-collision-entity-lookups: true
+    tick: true
+  behavior:
+    allow-spider-world-border-climbing: true
+    baby-zombie-movement-modifier: 0.5
+    disable-chest-cat-detection: false
+    disable-creeper-lingering-effect: false
+    disable-player-crits: false
+    door-breaking-difficulty:
+      husk:
+      - HARD
+      vindicator:
+      - NORMAL
+      - HARD
+      zombie:
+      - HARD
+      zombie_villager:
+      - HARD
+      zombified_piglin:
+      - HARD
+    ender-dragons-death-always-places-dragon-egg: false
+    experience-merge-max-value: -1
+    mobs-can-always-pick-up-loot:
+      skeletons: false
+      zombies: false
+    nerf-pigmen-from-nether-portals: false
+    parrots-are-unaffected-by-player-movement: false
+    phantoms-do-not-spawn-on-creative-players: true
+    phantoms-only-attack-insomniacs: true
+    phantoms-spawn-attempt-max-seconds: 119
+    phantoms-spawn-attempt-min-seconds: 60
+    piglins-guard-chests: true
+    pillager-patrols:
+      disable: false
+      spawn-chance: 0.2
+      spawn-delay:
+        per-player: false
+        ticks: 12000
+      start:
+        day: 5
+        per-player: false
+    player-insomnia-start-ticks: 72000
+    should-remove-dragon: false
+    spawner-nerfed-mobs-should-jump: false
+    zombie-villager-infection-chance: default
+    zombies-target-turtle-eggs: true
+  entities-target-with-follow-range: false
+  markers:
+    tick: true
+  mob-effects:
+    immune-to-wither-effect:
+      wither: true
+      wither-skeleton: true
+    spiders-immune-to-poison-effect: true
+    undead-immune-to-certain-effects: true
+  sniffer:
+    boosted-hatch-time: default
+    hatch-time: default
+  spawning:
+    all-chunks-are-slime-chunks: false
+    alt-item-despawn-rate:
+      enabled: false
+      items:
+        cobblestone: 300
+    count-all-mobs-for-spawning: false
+    creative-arrow-despawn-rate: default
+    despawn-ranges:
+      ambient:
+        hard: 128
+        soft: 32
+      axolotls:
+        hard: 128
+        soft: 32
+      creature:
+        hard: 128
+        soft: 32
+      misc:
+        hard: 128
+        soft: 32
+      monster:
+        hard: 128
+        soft: 32
+      underground_water_creature:
+        hard: 128
+        soft: 32
+      water_ambient:
+        hard: 64
+        soft: 32
+      water_creature:
+        hard: 128
+        soft: 32
+    disable-mob-spawner-spawn-egg-transformation: false
+    duplicate-uuid:
+      mode: SAFE_REGEN
+      safe-regen-delete-range: 32
+    filter-bad-tile-entity-nbt-from-falling-blocks: true
+    filtered-entity-tag-nbt-paths:
+    - Pos
+    - Motion
+    - SleepingX
+    - SleepingY
+    - SleepingZ
+    iron-golems-can-spawn-in-air: false
+    monster-spawn-max-light-level: default
+    non-player-arrow-despawn-rate: default
+    per-player-mob-spawns: true
+    scan-for-legacy-ender-dragon: true
+    skeleton-horse-thunder-spawn-chance: default
+    slime-spawn-height:
+      slime-chunk:
+        maximum: 40.0
+      surface-biome:
+        maximum: 70.0
+        minimum: 50.0
+    spawn-limits:
+      ambient: -1
+      axolotls: -1
+      creature: -1
+      monster: -1
+      underground_water_creature: -1
+      water_ambient: -1
+      water_creature: -1
+    wandering-trader:
+      spawn-chance-failure-increment: 25
+      spawn-chance-max: 75
+      spawn-chance-min: 25
+      spawn-day-length: 24000
+      spawn-minute-length: 1200
+    wateranimal-spawn-height:
+      maximum: default
+      minimum: default
+  tracking-range-y:
+    animal: default
+    display: default
+    enabled: false
+    misc: default
+    monster: default
+    other: default
+    player: default
+environment:
+  disable-explosion-knockback: false
+  disable-ice-and-snow: false
+  disable-teleportation-suffocation-check: false
+  disable-thunder: false
+  fire-tick-delay: 30
+  frosted-ice:
+    delay:
+      max: 40
+      min: 20
+    enabled: true
+  generate-flat-bedrock: false
+  nether-ceiling-void-damage-height: disabled
+  optimize-explosions: false
+  portal-create-radius: 16
+  portal-search-radius: 128
+  portal-search-vanilla-dimension-scaling: true
+  treasure-maps:
+    enabled: true
+    find-already-discovered:
+      loot-tables: default
+      villager-trade: false
+  water-over-lava-flow-speed: 5
+feature-seeds:
+  generate-random-seeds-for-all: false
+fishing-time-range:
+  maximum: 600
+  minimum: 100
+fixes:
+  disable-unloaded-chunk-enderpearl-exploit: true
+  falling-block-height-nerf: disabled
+  fix-items-merging-through-walls: false
+  prevent-tnt-from-moving-in-water: false
+  split-overstacked-loot: true
+  tnt-entity-height-nerf: disabled
+hopper:
+  cooldown-when-full: true
+  disable-move-event: false
+  ignore-occluding-blocks: false
+lootables:
+  auto-replenish: false
+  max-refills: -1
+  refresh-max: 2d
+  refresh-min: 12h
+  reset-seed-on-fill: true
+  restrict-player-reloot: true
+  restrict-player-reloot-time: disabled
+maps:
+  item-frame-cursor-limit: 128
+  item-frame-cursor-update-interval: 10
+max-growth-height:
+  bamboo:
+    max: 16
+    min: 11
+  cactus: 3
+  reeds: 3
+misc:
+  disable-end-credits: false
+  disable-relative-projectile-velocity: false
+  disable-sprint-interruption-on-attack: false
+  light-queue-size: 20
+  max-leash-distance: 10.0
+  redstone-implementation: VANILLA
+  shield-blocking-delay: 5
+  show-sign-click-command-failure-msgs-to-player: false
+  update-pathfinding-on-block-update: true
+scoreboards:
+  allow-non-player-entities-on-scoreboards: true
+  use-vanilla-world-scoreboard-name-coloring: false
+spawn:
+  allow-using-signs-inside-spawn-protection: false
+  keep-spawn-loaded: true
+  keep-spawn-loaded-range: 10
+tick-rates:
+  behavior:
+    villager:
+      validatenearbypoi: -1
+  container-update: 1
+  dry-farmland: 1
+  grass-spread: 1
+  mob-spawner: 1
+  sensor:
+    villager:
+      secondarypoisensor: 40
+  wet-farmland: 1
+unsupported-settings:
+  fix-invulnerable-end-crystal-exploit: true
diff --git a/paper/run/eula.txt b/paper/run/eula.txt
new file mode 100644
index 0000000..1dd01a0
--- /dev/null
+++ b/paper/run/eula.txt
@@ -0,0 +1,3 @@
+#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).
+#Mon Oct 16 20:19:20 EDT 2023
+eula=true
diff --git a/paper/run/ops.json b/paper/run/ops.json
new file mode 100644
index 0000000..b8c8963
--- /dev/null
+++ b/paper/run/ops.json
@@ -0,0 +1,14 @@
+[
+  {
+    "uuid": "45123240-248b-44e3-93c9-5c89093ffaad",
+    "name": "Asruna",
+    "level": 4,
+    "bypassesPlayerLimit": false
+  },
+  {
+    "uuid": "64ccbf4e-87d2-490f-9370-8c4e53df9013",
+    "name": "Rukkhadevata",
+    "level": 4,
+    "bypassesPlayerLimit": false
+  }
+]
\ No newline at end of file
diff --git a/paper/run/server.properties b/paper/run/server.properties
new file mode 100644
index 0000000..7caccbf
--- /dev/null
+++ b/paper/run/server.properties
@@ -0,0 +1,60 @@
+#Minecraft server properties
+#Wed Dec 06 14:58:01 EST 2023
+enable-jmx-monitoring=false
+rcon.port=25575
+level-seed=
+gamemode=survival
+enable-command-block=false
+enable-query=false
+generator-settings={}
+enforce-secure-profile=true
+level-name=world
+motd=A test server
+query.port=25565
+pvp=true
+generate-structures=true
+max-chained-neighbor-updates=1000000
+difficulty=peaceful
+network-compression-threshold=256
+max-tick-time=60000
+require-resource-pack=false
+use-native-transport=true
+max-players=5
+online-mode=true
+enable-status=true
+allow-flight=false
+initial-disabled-packs=
+broadcast-rcon-to-ops=false
+view-distance=6
+server-ip=
+resource-pack-prompt=
+allow-nether=false
+server-port=25565
+enable-rcon=false
+sync-chunk-writes=false
+op-permission-level=4
+prevent-proxy-connections=false
+hide-online-players=false
+resource-pack=
+entity-broadcast-range-percentage=100
+simulation-distance=10
+rcon.password=
+player-idle-timeout=0
+debug=false
+force-gamemode=false
+rate-limit=0
+hardcore=false
+white-list=false
+broadcast-console-to-ops=false
+spawn-npcs=true
+spawn-animals=true
+log-ips=false
+function-permission-level=2
+initial-enabled-packs=vanilla
+level-type=minecraft\:normal
+text-filtering-config=
+spawn-monsters=true
+enforce-whitelist=false
+spawn-protection=32
+resource-pack-sha1=
+max-world-size=29999984
diff --git a/paper/run/spigot.yml b/paper/run/spigot.yml
new file mode 100644
index 0000000..03fb4c0
--- /dev/null
+++ b/paper/run/spigot.yml
@@ -0,0 +1,177 @@
+# This is the main configuration file for Spigot.
+# As you can see, there's tons to configure. Some options may impact gameplay, so use
+# with caution, and make sure you know what each option does before configuring.
+# For a reference for any variable inside this file, check out the Spigot wiki at
+# http://www.spigotmc.org/wiki/spigot-configuration/
+#
+# If you need help with the configuration or have any questions related to Spigot,
+# join us at the Discord or drop by our forums and leave a post.
+#
+# Discord: https://www.spigotmc.org/go/discord
+# Forums: http://www.spigotmc.org/
+
+settings:
+  debug: false
+  timeout-time: 60
+  restart-on-crash: false
+  restart-script: ./start.sh
+  save-user-cache-on-stop-only: false
+  moved-too-quickly-multiplier: 10.0
+  moved-wrongly-threshold: 0.0625
+  player-shuffle: 0
+  user-cache-size: 1000
+  netty-threads: 4
+  attribute:
+    maxHealth:
+      max: 2048.0
+    movementSpeed:
+      max: 2048.0
+    attackDamage:
+      max: 2048.0
+  log-villager-deaths: false
+  log-named-deaths: false
+  sample-count: 12
+  bungeecord: false
+messages:
+  restart: Server is restarting
+  whitelist: You are not whitelisted on this server!
+  unknown-command: Unknown command. Type "/help" for help.
+  server-full: The server is full!
+  outdated-client: Outdated client! Please use {0}
+  outdated-server: Outdated server! I'm still on {0}
+advancements:
+  disable-saving: true
+  disabled:
+  - minecraft:story/disabled
+commands:
+  silent-commandblock-console: false
+  spam-exclusions:
+  - /skill
+  replace-commands:
+  - setblock
+  - summon
+  - testforblock
+  - tellraw
+  log: true
+  tab-complete: 0
+  send-namespaced: true
+players:
+  disable-saving: false
+world-settings:
+  default:
+    below-zero-generation-in-existing-chunks: true
+    hanging-tick-frequency: 100
+    dragon-death-sound-radius: 0
+    wither-spawn-sound-radius: 0
+    end-portal-sound-radius: 0
+    zombie-aggressive-towards-villager: true
+    entity-activation-range:
+      animals: 32
+      monsters: 32
+      raiders: 48
+      misc: 16
+      water: 16
+      villagers: 32
+      flying-monsters: 32
+      wake-up-inactive:
+        animals-max-per-tick: 4
+        animals-every: 1200
+        animals-for: 100
+        monsters-max-per-tick: 8
+        monsters-every: 400
+        monsters-for: 100
+        villagers-max-per-tick: 4
+        villagers-every: 600
+        villagers-for: 100
+        flying-monsters-max-per-tick: 8
+        flying-monsters-every: 200
+        flying-monsters-for: 100
+      villagers-work-immunity-after: 100
+      villagers-work-immunity-for: 20
+      villagers-active-for-panic: true
+      tick-inactive-villagers: true
+      ignore-spectators: false
+    seed-village: 10387312
+    seed-desert: 14357617
+    seed-igloo: 14357618
+    seed-jungle: 14357619
+    seed-swamp: 14357620
+    seed-monument: 10387313
+    seed-shipwreck: 165745295
+    seed-ocean: 14357621
+    seed-outpost: 165745296
+    seed-endcity: 10387313
+    seed-slime: 987234911
+    seed-nether: 30084232
+    seed-mansion: 10387319
+    seed-fossil: 14357921
+    seed-portal: 34222645
+    seed-ancientcity: 20083232
+    seed-trailruins: 83469867
+    seed-buriedtreasure: 10387320
+    seed-mineshaft: default
+    seed-stronghold: default
+    entity-tracking-range:
+      players: 48
+      animals: 48
+      monsters: 48
+      misc: 32
+      display: 128
+      other: 64
+    ticks-per:
+      hopper-transfer: 8
+      hopper-check: 1
+    hopper-amount: 1
+    hopper-can-load-chunks: false
+    max-tnt-per-tick: 100
+    max-tick-time:
+      tile: 50
+      entity: 50
+    hunger:
+      jump-walk-exhaustion: 0.05
+      jump-sprint-exhaustion: 0.2
+      combat-exhaustion: 0.1
+      regen-exhaustion: 6.0
+      swim-multiplier: 0.01
+      sprint-multiplier: 0.1
+      other-multiplier: 0.0
+    enable-zombie-pigmen-portal-spawns: true
+    thunder-chance: 100000
+    growth:
+      cactus-modifier: 100
+      cane-modifier: 100
+      melon-modifier: 100
+      mushroom-modifier: 100
+      pumpkin-modifier: 100
+      sapling-modifier: 100
+      beetroot-modifier: 100
+      carrot-modifier: 100
+      potato-modifier: 100
+      torchflower-modifier: 100
+      wheat-modifier: 100
+      netherwart-modifier: 100
+      vine-modifier: 100
+      cocoa-modifier: 100
+      bamboo-modifier: 100
+      sweetberry-modifier: 100
+      kelp-modifier: 100
+      twistingvines-modifier: 100
+      weepingvines-modifier: 100
+      cavevines-modifier: 100
+      glowberry-modifier: 100
+      pitcherplant-modifier: 100
+    mob-spawn-range: 8
+    simulation-distance: default
+    merge-radius:
+      item: 2.5
+      exp: 3.0
+    arrow-despawn-rate: 1200
+    trident-despawn-rate: 1200
+    view-distance: default
+    item-despawn-rate: 6000
+    nerf-spawner-mobs: false
+    verbose: false
+config-version: 12
+stats:
+  disable-saving: false
+  forced-stats: {}
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/CrazyAuctions.java b/paper/src/main/java/com/badbones69/crazyauctions/CrazyAuctions.java
similarity index 62%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/CrazyAuctions.java
rename to paper/src/main/java/com/badbones69/crazyauctions/CrazyAuctions.java
index 276f6d6..9afe167 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/CrazyAuctions.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/CrazyAuctions.java
@@ -1,15 +1,15 @@
-package com.badbones69.crazyauctions.paper;
+package com.badbones69.crazyauctions;
 
-import com.badbones69.crazyauctions.paper.api.CrazyManager;
-import com.badbones69.crazyauctions.paper.api.FileManager;
-import com.badbones69.crazyauctions.paper.api.enums.Messages;
-import com.badbones69.crazyauctions.paper.api.support.PluginSupport;
-import com.badbones69.crazyauctions.paper.api.support.metrics.MetricsWrapper;
-import com.badbones69.crazyauctions.paper.commands.AuctionCommand;
-import com.badbones69.crazyauctions.paper.commands.AuctionTab;
-import com.badbones69.crazyauctions.paper.controllers.GuiListener;
-import com.badbones69.crazyauctions.paper.controllers.MarcoListener;
-import com.badbones69.crazyauctions.paper.currency.VaultSupport;
+import com.badbones69.crazyauctions.api.CrazyManager;
+import com.badbones69.crazyauctions.api.FileManager;
+import com.badbones69.crazyauctions.api.enums.Messages;
+import com.badbones69.crazyauctions.api.support.PluginSupport;
+import com.badbones69.crazyauctions.api.support.metrics.MetricsWrapper;
+import com.badbones69.crazyauctions.commands.AuctionCommand;
+import com.badbones69.crazyauctions.commands.AuctionTab;
+import com.badbones69.crazyauctions.controllers.GuiListener;
+import com.badbones69.crazyauctions.controllers.MarcoListener;
+import com.badbones69.crazyauctions.currency.VaultSupport;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.command.TabCompleter;
@@ -32,8 +32,18 @@ public class CrazyAuctions extends JavaPlugin {
 
     private VaultSupport support;
 
+    private MetricsWrapper metrics;
+
     @Override
     public void onEnable() {
+        if (!PluginSupport.VAULT.isPluginEnabled()) {
+            getLogger().severe("Vault was not found so the plugin will now disable.");
+
+            getServer().getPluginManager().disablePlugin(this);
+
+            return;
+        }
+
         this.timer = new Timer();
 
         this.fileManager = new FileManager();
@@ -51,7 +61,7 @@ public class CrazyAuctions extends JavaPlugin {
         TimerTask task = new TimerTask() {
             @Override
             public void run() {
-                Methods.updateAuction();
+                getServer().getScheduler().runTask(get(), Methods::updateAuction);
             }
         };
 
@@ -61,14 +71,12 @@ public class CrazyAuctions extends JavaPlugin {
         Messages.addMissingMessages();
 
         // Enable vault support if enabled.
-        if (PluginSupport.VAULT.isPluginEnabled()) {
-            this.support = new VaultSupport();
-            support.loadVault();
-        }
+        this.support = new VaultSupport();
+        support.loadVault();
 
         // Create bstats instance.
-        MetricsWrapper wrapper = new MetricsWrapper();
-        wrapper.start();
+        this.metrics = new MetricsWrapper();
+        this.metrics.start();
     }
 
     private void registerCommand(PluginCommand pluginCommand, TabCompleter tabCompleter, CommandExecutor commandExecutor) {
@@ -81,9 +89,9 @@ public class CrazyAuctions extends JavaPlugin {
 
     @Override
     public void onDisable() {
-        if (timer != null) timer.cancel();
+        if (this.timer != null) this.timer.cancel();
 
-        this.crazyManager.unload();
+        if (this.crazyManager != null) this.crazyManager.unload();
     }
 
     @NotNull
@@ -95,6 +103,10 @@ public class CrazyAuctions extends JavaPlugin {
         return this.support;
     }
 
+    public MetricsWrapper getMetrics() {
+        return this.metrics;
+    }
+
     @NotNull
     public CrazyManager getCrazyManager() {
         return this.crazyManager;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/Methods.java b/paper/src/main/java/com/badbones69/crazyauctions/Methods.java
similarity index 98%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/Methods.java
rename to paper/src/main/java/com/badbones69/crazyauctions/Methods.java
index 884413d..87af34d 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/Methods.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/Methods.java
@@ -1,9 +1,9 @@
-package com.badbones69.crazyauctions.paper;
+package com.badbones69.crazyauctions;
 
-import com.badbones69.crazyauctions.paper.api.FileManager.Files;
-import com.badbones69.crazyauctions.paper.api.enums.Messages;
-import com.badbones69.crazyauctions.paper.api.events.AuctionExpireEvent;
-import com.badbones69.crazyauctions.paper.api.events.AuctionWinBidEvent;
+import com.badbones69.crazyauctions.api.FileManager.Files;
+import com.badbones69.crazyauctions.api.enums.Messages;
+import com.badbones69.crazyauctions.api.events.AuctionExpireEvent;
+import com.badbones69.crazyauctions.api.events.AuctionWinBidEvent;
 import org.bukkit.*;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/CrazyManager.java b/paper/src/main/java/com/badbones69/crazyauctions/api/CrazyManager.java
similarity index 90%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/CrazyManager.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/CrazyManager.java
index 5bd8b65..2cbcd70 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/CrazyManager.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/CrazyManager.java
@@ -1,7 +1,7 @@
-package com.badbones69.crazyauctions.paper.api;
+package com.badbones69.crazyauctions.api;
 
-import com.badbones69.crazyauctions.paper.api.FileManager.Files;
-import com.badbones69.crazyauctions.paper.api.enums.ShopType;
+import com.badbones69.crazyauctions.api.FileManager.Files;
+import com.badbones69.crazyauctions.api.enums.ShopType;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/FileManager.java b/paper/src/main/java/com/badbones69/crazyauctions/api/FileManager.java
similarity index 99%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/FileManager.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/FileManager.java
index fe3bf3e..8bacf39 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/FileManager.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/FileManager.java
@@ -1,6 +1,6 @@
-package com.badbones69.crazyauctions.paper.api;
+package com.badbones69.crazyauctions.api;
 
-import com.badbones69.crazyauctions.paper.CrazyAuctions;
+import com.badbones69.crazyauctions.CrazyAuctions;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Category.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Category.java
similarity index 98%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Category.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/Category.java
index f5fe1c7..73868ff 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Category.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Category.java
@@ -1,4 +1,4 @@
-package com.badbones69.crazyauctions.paper.api.enums;
+package com.badbones69.crazyauctions.api.enums;
 
 import org.bukkit.Material;
 import java.util.ArrayList;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Messages.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Messages.java
similarity index 98%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Messages.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/Messages.java
index f1648f1..a8c4a9b 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Messages.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Messages.java
@@ -1,7 +1,7 @@
-package com.badbones69.crazyauctions.paper.api.enums;
+package com.badbones69.crazyauctions.api.enums;
 
-import com.badbones69.crazyauctions.paper.Methods;
-import com.badbones69.crazyauctions.paper.api.FileManager.Files;
+import com.badbones69.crazyauctions.Methods;
+import com.badbones69.crazyauctions.api.FileManager.Files;
 import org.bukkit.configuration.file.FileConfiguration;
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Reaons.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Reaons.java
similarity index 78%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Reaons.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/Reaons.java
index 7a5a3bb..cc8387c 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/Reaons.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/Reaons.java
@@ -1,4 +1,4 @@
-package com.badbones69.crazyauctions.paper.api.enums;
+package com.badbones69.crazyauctions.api.enums;
 
 public enum Reaons {
     
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/ShopType.java b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java
similarity index 92%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/ShopType.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java
index d2a5478..6b02397 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/enums/ShopType.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/enums/ShopType.java
@@ -1,4 +1,4 @@
-package com.badbones69.crazyauctions.paper.api.enums;
+package com.badbones69.crazyauctions.api.enums;
 
 public enum ShopType {
     
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionBuyEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java
similarity index 95%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionBuyEvent.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java
index c5df21d..2ffae34 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionBuyEvent.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionBuyEvent.java
@@ -1,4 +1,4 @@
-package com.badbones69.crazyauctions.paper.api.events;
+package com.badbones69.crazyauctions.api.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionCancelledEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java
similarity index 94%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionCancelledEvent.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java
index ffe1027..0af07c8 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionCancelledEvent.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionCancelledEvent.java
@@ -1,6 +1,6 @@
-package com.badbones69.crazyauctions.paper.api.events;
+package com.badbones69.crazyauctions.api.events;
 
-import com.badbones69.crazyauctions.paper.api.enums.Reaons;
+import com.badbones69.crazyauctions.api.enums.Reaons;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionExpireEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java
similarity index 96%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionExpireEvent.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java
index 44b82fd..755d4a1 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionExpireEvent.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionExpireEvent.java
@@ -1,4 +1,4 @@
-package com.badbones69.crazyauctions.paper.api.events;
+package com.badbones69.crazyauctions.api.events;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionListEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java
similarity index 92%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionListEvent.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java
index 4d95dd0..535b9aa 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionListEvent.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionListEvent.java
@@ -1,6 +1,6 @@
-package com.badbones69.crazyauctions.paper.api.events;
+package com.badbones69.crazyauctions.api.events;
 
-import com.badbones69.crazyauctions.paper.api.enums.ShopType;
+import com.badbones69.crazyauctions.api.enums.ShopType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionNewBidEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java
similarity index 95%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionNewBidEvent.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java
index 3021b15..02d0cd0 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionNewBidEvent.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionNewBidEvent.java
@@ -1,4 +1,4 @@
-package com.badbones69.crazyauctions.paper.api.events;
+package com.badbones69.crazyauctions.api.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionWinBidEvent.java b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java
similarity index 95%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionWinBidEvent.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java
index bfa7aec..c291f02 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/events/AuctionWinBidEvent.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/events/AuctionWinBidEvent.java
@@ -1,4 +1,4 @@
-package com.badbones69.crazyauctions.paper.api.events;
+package com.badbones69.crazyauctions.api.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/support/PluginSupport.java b/paper/src/main/java/com/badbones69/crazyauctions/api/support/PluginSupport.java
similarity index 85%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/support/PluginSupport.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/support/PluginSupport.java
index 0224edd..6e43927 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/support/PluginSupport.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/support/PluginSupport.java
@@ -1,6 +1,6 @@
-package com.badbones69.crazyauctions.paper.api.support;
+package com.badbones69.crazyauctions.api.support;
 
-import com.badbones69.crazyauctions.paper.CrazyAuctions;
+import com.badbones69.crazyauctions.CrazyAuctions;
 import org.jetbrains.annotations.NotNull;
 
 public enum PluginSupport {
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/support/metrics/MetricsWrapper.java b/paper/src/main/java/com/badbones69/crazyauctions/api/support/metrics/MetricsWrapper.java
similarity index 88%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/api/support/metrics/MetricsWrapper.java
rename to paper/src/main/java/com/badbones69/crazyauctions/api/support/metrics/MetricsWrapper.java
index ff5cfab..b60e969 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/api/support/metrics/MetricsWrapper.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/api/support/metrics/MetricsWrapper.java
@@ -1,6 +1,6 @@
-package com.badbones69.crazyauctions.paper.api.support.metrics;
+package com.badbones69.crazyauctions.api.support.metrics;
 
-import com.badbones69.crazyauctions.paper.CrazyAuctions;
+import com.badbones69.crazyauctions.CrazyAuctions;
 import org.bstats.bukkit.Metrics;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/commands/AuctionCommand.java b/paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java
similarity index 97%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/commands/AuctionCommand.java
rename to paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java
index 2c16c59..98da5c1 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/commands/AuctionCommand.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionCommand.java
@@ -1,15 +1,15 @@
-package com.badbones69.crazyauctions.paper.commands;
+package com.badbones69.crazyauctions.commands;
 
-import com.badbones69.crazyauctions.paper.CrazyAuctions;
-import com.badbones69.crazyauctions.paper.Methods;
-import com.badbones69.crazyauctions.paper.api.CrazyManager;
-import com.badbones69.crazyauctions.paper.api.FileManager;
-import com.badbones69.crazyauctions.paper.api.FileManager.Files;
-import com.badbones69.crazyauctions.paper.api.enums.Category;
-import com.badbones69.crazyauctions.paper.api.enums.Messages;
-import com.badbones69.crazyauctions.paper.api.enums.ShopType;
-import com.badbones69.crazyauctions.paper.api.events.AuctionListEvent;
-import com.badbones69.crazyauctions.paper.controllers.GuiListener;
+import com.badbones69.crazyauctions.CrazyAuctions;
+import com.badbones69.crazyauctions.Methods;
+import com.badbones69.crazyauctions.api.CrazyManager;
+import com.badbones69.crazyauctions.api.FileManager;
+import com.badbones69.crazyauctions.api.FileManager.Files;
+import com.badbones69.crazyauctions.api.enums.Category;
+import com.badbones69.crazyauctions.api.enums.Messages;
+import com.badbones69.crazyauctions.api.enums.ShopType;
+import com.badbones69.crazyauctions.api.events.AuctionListEvent;
+import com.badbones69.crazyauctions.controllers.GuiListener;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/commands/AuctionTab.java b/paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java
similarity index 94%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/commands/AuctionTab.java
rename to paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java
index 7c82881..df809b3 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/commands/AuctionTab.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/commands/AuctionTab.java
@@ -1,7 +1,6 @@
-package com.badbones69.crazyauctions.paper.commands;
+package com.badbones69.crazyauctions.commands;
 
-import com.badbones69.crazyauctions.paper.CrazyAuctions;
-import org.bukkit.Bukkit;
+import com.badbones69.crazyauctions.CrazyAuctions;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/controllers/GuiListener.java b/paper/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java
similarity index 97%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/controllers/GuiListener.java
rename to paper/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java
index 515de56..6ee41a0 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/controllers/GuiListener.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java
@@ -1,16 +1,16 @@
-package com.badbones69.crazyauctions.paper.controllers;
+package com.badbones69.crazyauctions.controllers;
 
-import com.badbones69.crazyauctions.paper.CrazyAuctions;
-import com.badbones69.crazyauctions.paper.Methods;
-import com.badbones69.crazyauctions.paper.api.*;
-import com.badbones69.crazyauctions.paper.api.FileManager.Files;
-import com.badbones69.crazyauctions.paper.api.enums.Category;
-import com.badbones69.crazyauctions.paper.api.enums.Reaons;
-import com.badbones69.crazyauctions.paper.api.enums.Messages;
-import com.badbones69.crazyauctions.paper.api.enums.ShopType;
-import com.badbones69.crazyauctions.paper.api.events.AuctionBuyEvent;
-import com.badbones69.crazyauctions.paper.api.events.AuctionCancelledEvent;
-import com.badbones69.crazyauctions.paper.api.events.AuctionNewBidEvent;
+import com.badbones69.crazyauctions.CrazyAuctions;
+import com.badbones69.crazyauctions.Methods;
+import com.badbones69.crazyauctions.api.*;
+import com.badbones69.crazyauctions.api.FileManager.Files;
+import com.badbones69.crazyauctions.api.enums.Category;
+import com.badbones69.crazyauctions.api.enums.Reaons;
+import com.badbones69.crazyauctions.api.enums.Messages;
+import com.badbones69.crazyauctions.api.enums.ShopType;
+import com.badbones69.crazyauctions.api.events.AuctionBuyEvent;
+import com.badbones69.crazyauctions.api.events.AuctionCancelledEvent;
+import com.badbones69.crazyauctions.api.events.AuctionNewBidEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.SoundCategory;
@@ -34,12 +34,12 @@ public class GuiListener implements Listener {
     private static final CrazyAuctions plugin = CrazyAuctions.get();
     private static final CrazyManager crazyManager = plugin.getCrazyManager();
     
-    private static HashMap<UUID, Integer> bidding = new HashMap<>();
-    private static HashMap<UUID, String> biddingID = new HashMap<>();
-    private static HashMap<UUID, ShopType> shopType = new HashMap<>(); // Shop Type
-    private static HashMap<UUID, Category> shopCategory = new HashMap<>(); // Category Type
-    private static HashMap<UUID, List<Integer>> List = new HashMap<>();
-    private static HashMap<UUID, String> IDs = new HashMap<>();
+    private static final HashMap<UUID, Integer> bidding = new HashMap<>();
+    private static final HashMap<UUID, String> biddingID = new HashMap<>();
+    private static final HashMap<UUID, ShopType> shopType = new HashMap<>(); // Shop Type
+    private static final HashMap<UUID, Category> shopCategory = new HashMap<>(); // Category Type
+    private static final HashMap<UUID, List<Integer>> List = new HashMap<>();
+    private static final HashMap<UUID, String> IDs = new HashMap<>();
     
     public static void openShop(Player player, ShopType sell, Category cat, int page) {
         Methods.updateAuction();
@@ -373,7 +373,7 @@ public class GuiListener implements Listener {
         }
 
         Inventory inv = plugin.getServer().createInventory(null, 27, Methods.color(config.getString("Settings.Bidding-On-Item")));
-        if (!bidding.containsKey(player)) bidding.put(player.getUniqueId(), 0);
+        if (!bidding.containsKey(player.getUniqueId())) bidding.put(player.getUniqueId(), 0);
 
         inv.setItem(9, Methods.makeItem("LIME_STAINED_GLASS_PANE", 1, "&a+1"));
         inv.setItem(10, Methods.makeItem("LIME_STAINED_GLASS_PANE", 1, "&a+10"));
@@ -717,7 +717,7 @@ public class GuiListener implements Listener {
                                 }
                             }
 
-                            if (List.containsKey(player)) {
+                            if (List.containsKey(player.getUniqueId())) {
                                 if (List.get(player.getUniqueId()).size() >= slot) {
                                     int id = List.get(player.getUniqueId()).get(slot);
                                     boolean T = false;
@@ -927,7 +927,7 @@ public class GuiListener implements Listener {
                                 }
                             }
 
-                            if (List.containsKey(player)) {
+                            if (List.containsKey(player.getUniqueId())) {
                                 if (List.get(player.getUniqueId()).size() >= slot) {
                                     int id = List.get(player.getUniqueId()).get(slot);
                                     boolean T = false;
@@ -1023,7 +1023,7 @@ public class GuiListener implements Listener {
                                 }
                             }
 
-                            if (List.containsKey(player)) {
+                            if (List.containsKey(player.getUniqueId())) {
                                 if (List.get(player.getUniqueId()).size() >= slot) {
                                     int id = List.get(player.getUniqueId()).get(slot);
                                     boolean T = false;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/controllers/MarcoListener.java b/paper/src/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java
similarity index 84%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/controllers/MarcoListener.java
rename to paper/src/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java
index f3f5606..4936ea5 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/controllers/MarcoListener.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/controllers/MarcoListener.java
@@ -1,6 +1,6 @@
-package com.badbones69.crazyauctions.paper.controllers;
+package com.badbones69.crazyauctions.controllers;
 
-import com.badbones69.crazyauctions.paper.api.FileManager.Files;
+import com.badbones69.crazyauctions.api.FileManager.Files;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/paper/src/main/java/com/badbones69/crazyauctions/paper/currency/VaultSupport.java b/paper/src/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java
similarity index 91%
rename from paper/src/main/java/com/badbones69/crazyauctions/paper/currency/VaultSupport.java
rename to paper/src/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java
index f4ffbae..599aaca 100644
--- a/paper/src/main/java/com/badbones69/crazyauctions/paper/currency/VaultSupport.java
+++ b/paper/src/main/java/com/badbones69/crazyauctions/currency/VaultSupport.java
@@ -1,6 +1,6 @@
-package com.badbones69.crazyauctions.paper.currency;
+package com.badbones69.crazyauctions.currency;
 
-import com.badbones69.crazyauctions.paper.CrazyAuctions;
+import com.badbones69.crazyauctions.CrazyAuctions;
 import net.milkbowl.vault.economy.Economy;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
diff --git a/paper/src/main/resources/plugin.yml b/paper/src/main/resources/plugin.yml
index 5b140bc..cb80cd8 100644
--- a/paper/src/main/resources/plugin.yml
+++ b/paper/src/main/resources/plugin.yml
@@ -8,7 +8,7 @@ api-version: '${apiVersion}'
 description: '${description}'
 website: '${website}'
 
-depend: [Vault]
+softdepend: [Vault]
 
 commands:
   crazyauctions: