diff --git a/plugins/combattagplus-paper/.github/workflows/pr_updated.yml b/plugins/combattagplus-paper/.github/workflows/pr_updated.yml
deleted file mode 100644
index b28b2e815..000000000
--- a/plugins/combattagplus-paper/.github/workflows/pr_updated.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: ⬇️ PR Updated
-
-on:
-    pull_request:
-        types: [opened, synchronize, reopened]
-
-jobs:
-    call_gradle_build:
-        name: ☎️ Call  Gradle Build
-        uses: CivMC/.github/.github/workflows/gradle_build.yml@master
-        with:
-            gradle_task: reobf
-        secrets: inherit
diff --git a/plugins/combattagplus-paper/.github/workflows/pr_updated_completed.yml b/plugins/combattagplus-paper/.github/workflows/pr_updated_completed.yml
deleted file mode 100644
index ae9dd7613..000000000
--- a/plugins/combattagplus-paper/.github/workflows/pr_updated_completed.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: ✅ PR Updated Completed
-
-on:
-    workflow_run:
-        types:
-            - "completed"
-        workflows:
-            - "⬇️ PR Updated"
-
-jobs:
-    call_comment_on_pr:
-        name: ☎️ Call  Comment on PR
-        uses: CivMC/.github/.github/workflows/comment_on_pr.yml@master
-        secrets: inherit
diff --git a/plugins/combattagplus-paper/.github/workflows/tag_created.yml b/plugins/combattagplus-paper/.github/workflows/tag_created.yml
deleted file mode 100644
index 30ab804fa..000000000
--- a/plugins/combattagplus-paper/.github/workflows/tag_created.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 🏷️ Tag Created
-
-on:
-    push:
-        tags:
-            - 'v*.*.*'
-
-jobs:
-    call_gradle_publish:
-        name: ☎️ Call  Gradle Publish
-        uses: CivMC/.github/.github/workflows/gradle_publish.yml@master
-        secrets: inherit
diff --git a/plugins/combattagplus-paper/.gitignore b/plugins/combattagplus-paper/.gitignore
deleted file mode 100644
index 930263fc2..000000000
--- a/plugins/combattagplus-paper/.gitignore
+++ /dev/null
@@ -1,277 +0,0 @@
-# Created by https://www.gitignore.io/api/java,linux,macos,maven,batch,windows,eclipse,intellij+all
-# Edit at https://www.gitignore.io/?templates=java,linux,macos,maven,batch,windows,eclipse,intellij+all
-
-### Batch ###
-# BatchFiles
-*.bat
-*.cmd
-*.btm
-
-### Eclipse ###
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# Tern plugin
-.tern-project
-
-# TeXlipse plugin
-.texlipse
-
-# STS (Spring Tool Suite)
-.springBeans
-
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-### Eclipse Patch ###
-# Eclipse Core
-.project
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# Annotation Processing
-.apt_generated
-
-.sts4-cache/
-
-### Intellij+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Intellij+all Patch ###
-# Ignores the whole .idea folder and all .iml files
-# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
-
-.idea/
-
-# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
-
-*.iml
-modules.xml
-.idea/misc.xml
-*.ipr
-
-# Sonarlint plugin
-.idea/sonarlint
-
-### Java ###
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-### Linux ###
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-### macOS ###
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-.flattened-pom.xml
-
-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-# End of https://www.gitignore.io/api/java,linux,macos,maven,batch,windows,eclipse,intellij+all
-
-!gradle-wrapper.jar
-gradlew.bat
-build/
-.gradle/
diff --git a/plugins/combattagplus-paper/build.gradle.kts b/plugins/combattagplus-paper/build.gradle.kts
index b6c8f6851..0c3da16e0 100644
--- a/plugins/combattagplus-paper/build.gradle.kts
+++ b/plugins/combattagplus-paper/build.gradle.kts
@@ -1,24 +1,15 @@
-import net.civmc.civgradle.CivGradleExtension
-
 plugins {
-    id("net.civmc.civgradle") version "3.1.2" apply false
+    id("io.papermc.paperweight.userdev")
+    id("xyz.jpenilla.run-paper")
 }
 
-subprojects {
-    apply(plugin = "java-library")
-    apply(plugin = "maven-publish")
-    apply(plugin = "net.civmc.civgradle")
+version = "2.0.1"
 
-    configure<CivGradleExtension> {
-        pluginName = project.property("pluginName") as String
+dependencies {
+    paperweight {
+        paperDevBundle("1.18.2-R0.1-SNAPSHOT")
     }
 
-    repositories {
-        mavenCentral()
-
-        maven("https://papermc.io/repo/repository/maven-public/")
-        maven("https://ci.frostcast.net/plugin/repository/everything")
-
-        maven("https://jitpack.io")
-    }
+    compileOnly("com.github.TownyAdvanced:towny:0.97.5.0")
+    compileOnly("me.confuser:BarAPI:3.5")
 }
diff --git a/plugins/combattagplus-paper/gradle.properties b/plugins/combattagplus-paper/gradle.properties
deleted file mode 100644
index 602973166..000000000
--- a/plugins/combattagplus-paper/gradle.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Gradle properties
-group = net.civmc.combattagplus
-version = 2.0.1
-description = CombatTagPlus
-
-# Custom Properties
-pluginName = CombatTagPlus
diff --git a/plugins/combattagplus-paper/gradle/wrapper/gradle-wrapper.jar b/plugins/combattagplus-paper/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7f93135c4..000000000
Binary files a/plugins/combattagplus-paper/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/plugins/combattagplus-paper/gradle/wrapper/gradle-wrapper.properties b/plugins/combattagplus-paper/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 3fa8f862f..000000000
--- a/plugins/combattagplus-paper/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/plugins/combattagplus-paper/gradlew b/plugins/combattagplus-paper/gradlew
deleted file mode 100755
index 1aa94a426..000000000
--- a/plugins/combattagplus-paper/gradlew
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/plugins/combattagplus-paper/paper/build.gradle.kts b/plugins/combattagplus-paper/paper/build.gradle.kts
deleted file mode 100644
index 140f7d028..000000000
--- a/plugins/combattagplus-paper/paper/build.gradle.kts
+++ /dev/null
@@ -1,13 +0,0 @@
-plugins {
-    id("io.papermc.paperweight.userdev")
-    id("xyz.jpenilla.run-paper")
-}
-
-dependencies {
-    paperweight {
-      paperDevBundle("1.18.2-R0.1-SNAPSHOT")
-    }
-
-    compileOnly("com.github.TownyAdvanced:towny:0.97.5.0")
-    compileOnly("me.confuser:BarAPI:3.5")
-}
diff --git a/plugins/combattagplus-paper/settings.gradle.kts b/plugins/combattagplus-paper/settings.gradle.kts
deleted file mode 100644
index b897f7caa..000000000
--- a/plugins/combattagplus-paper/settings.gradle.kts
+++ /dev/null
@@ -1,16 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven("https://repo.civmc.net/repository/maven-public/")
-        maven("https://papermc.io/repo/repository/maven-public/")
-    }
-}
-
-plugins {
-    id("com.gradle.enterprise") version("3.16")
-}
-
-rootProject.name = "combattagplus"
-
-include(":paper")
-project(":paper").name = rootProject.name + "-paper"
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/BlockPosition.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/BlockPosition.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/BlockPosition.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/BlockPosition.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/CombatTagPlus.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/CombatTagPlus.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/CombatTagPlus.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/CombatTagPlus.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/Npc.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/Npc.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/Npc.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/Npc.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/NpcManager.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/NpcManager.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/NpcManager.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/NpcManager.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/NpcNameGeneratorImpl.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/NpcNameGeneratorImpl.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/NpcNameGeneratorImpl.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/NpcNameGeneratorImpl.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/PlayerCache.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/PlayerCache.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/PlayerCache.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/PlayerCache.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/Settings.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/Settings.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/Settings.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/Settings.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/Tag.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/Tag.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/Tag.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/Tag.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/TagManager.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/TagManager.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/TagManager.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/TagManager.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcIdentity.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcIdentity.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcIdentity.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcIdentity.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGenerator.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGenerator.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGenerator.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGenerator.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGeneratorFactory.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGeneratorFactory.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGeneratorFactory.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcNameGeneratorFactory.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcPlayerHelper.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcPlayerHelper.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/compat/base/NpcPlayerHelper.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/compat/base/NpcPlayerHelper.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/CombatLogEvent.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/CombatLogEvent.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/CombatLogEvent.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/CombatLogEvent.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/NpcDespawnEvent.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/NpcDespawnEvent.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/NpcDespawnEvent.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/NpcDespawnEvent.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/NpcDespawnReason.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/NpcDespawnReason.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/NpcDespawnReason.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/NpcDespawnReason.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/PlayerCombatTagEvent.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/PlayerCombatTagEvent.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/event/PlayerCombatTagEvent.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/event/PlayerCombatTagEvent.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/hook/Hook.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/hook/Hook.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/hook/Hook.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/hook/Hook.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/hook/HookManager.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/hook/HookManager.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/hook/HookManager.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/hook/HookManager.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/hook/TownyHook.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/hook/TownyHook.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/hook/TownyHook.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/hook/TownyHook.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/ForceFieldListener.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/ForceFieldListener.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/ForceFieldListener.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/ForceFieldListener.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/InstakillListener.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/InstakillListener.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/InstakillListener.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/InstakillListener.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/NpcListener.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/NpcListener.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/NpcListener.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/NpcListener.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/PlayerListener.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/PlayerListener.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/PlayerListener.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/PlayerListener.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/TagListener.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/TagListener.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/listener/TagListener.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/TagListener.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcNetworkManager.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcNetworkManager.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcNetworkManager.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcNetworkManager.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayer.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerConnection.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerConnection.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerConnection.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerConnection.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/nms/NpcPlayerHelperImpl.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/ForceFieldTask.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/ForceFieldTask.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/ForceFieldTask.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/ForceFieldTask.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/NpcDespawnTask.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/NpcDespawnTask.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/NpcDespawnTask.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/NpcDespawnTask.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/SafeLogoutTask.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/SafeLogoutTask.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/SafeLogoutTask.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/SafeLogoutTask.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/TagUpdateTask.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/TagUpdateTask.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/task/TagUpdateTask.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/task/TagUpdateTask.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/BarUtils.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/BarUtils.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/BarUtils.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/BarUtils.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/LruCache.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/LruCache.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/LruCache.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/LruCache.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/ReflectionUtils.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/ReflectionUtils.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/ReflectionUtils.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/ReflectionUtils.java
diff --git a/plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/Version.java b/plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/Version.java
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/java/net/minelink/ctplus/util/Version.java
rename to plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/util/Version.java
diff --git a/plugins/combattagplus-paper/paper/src/main/resources/config.yml b/plugins/combattagplus-paper/src/main/resources/config.yml
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/resources/config.yml
rename to plugins/combattagplus-paper/src/main/resources/config.yml
diff --git a/plugins/combattagplus-paper/paper/src/main/resources/plugin.yml b/plugins/combattagplus-paper/src/main/resources/plugin.yml
similarity index 100%
rename from plugins/combattagplus-paper/paper/src/main/resources/plugin.yml
rename to plugins/combattagplus-paper/src/main/resources/plugin.yml
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 362686f21..73f98c29a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,5 +10,6 @@ include(":plugins:civmodcore-paper")
 include(":plugins:civspy-api")
 include(":plugins:civspy-paper")
 include(":plugins:civspy-bungee")
+include(":plugins:combattagplus-paper")
 // TODO include(":plugins:namelayer-bungee")
 include(":plugins:namelayer-paper")