diff --git a/scripts/makemcdevsrc.sh b/scripts/makemcdevsrc.sh
index dd4c4e48a..bd86947f8 100755
--- a/scripts/makemcdevsrc.sh
+++ b/scripts/makemcdevsrc.sh
@@ -5,25 +5,25 @@ set -e
 PS1="$"
 
 basedir="$(cd "$1" && pwd -P)"
-cd "$basedir"
 workdir="$basedir/work"
 minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir="$workdir/Minecraft/$minecraftversion"
-nms="$decompiledir/spigot/net/minecraft/server"
-papernms="Paper-Server/src/main/java/net/minecraft/server"
-mcdevsrc="${decompiledir}/src/net/minecraft/server"
+nms="$decompiledir/spigot/net/minecraft"
+papernms="$basedir/Paper-Server/src/main/java/net/minecraft"
+mcdevsrc="${decompiledir}/src/net/minecraft"
 rm -rf "${mcdevsrc}"
 mkdir -p "${mcdevsrc}"
-find ${nms} -name *.java -print0 | xargs -I\{} -0 cp \{} "${mcdevsrc}/"
+cd "${nms}"
 
-for file in "${nms}/"*
+for file in $(find . -name '*.java')
 do
-    file=${file##*/}
-    # test if in Paper folder - already imported
-    if [ -f "${papernms}/${file}" ]; then
-        # remove from mcdevsrc folder
-        rm -f "${mcdevsrc}/${file}"
+    if [ ! -f "${papernms}/${file}" ]; then
+		destdir="${mcdevsrc}"/$(dirname "${file}")
+		mkdir -p "${destdir}"
+		cp "${file}" "${destdir}"
     fi
 done
+
+cd "$basedir"
 echo "Built $decompiledir/src to be included in your project for src access";
 )