diff --git a/.gitignore b/.gitignore
index 615b2764..74893bfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.DS_Store
 node_modules/
-.vuepress/*
\ No newline at end of file
+.vuepress/*
+.vscode
\ No newline at end of file
diff --git a/README.md b/README.md
index 8fcfa050..c2233a72 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,6 @@ If you are reading this it looks like you are looking to add an egg to your serv
 [Minecraft](/minecraft/)
 * [Bedrock](/minecraft/bedrock/)  
   * [Bedrock](/minecraft/bedrock/bedrock/)
-  * [DragonProxy](/minecraft/bedrock/dragonproxy/)  
   * [Nukkit](/minecraft/bedrock/nukkit/)  
   * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/)  
 
@@ -106,12 +105,18 @@ If you are reading this it looks like you are looking to add an egg to your serv
   * [Tuinity](/minecraft/java/tuinity/)
   * [VanillaCord](/minecraft/java/vanillacord/)
 
-* [Proxies](/minecraft/proxy/) (these are for the java version of minecraft)
-  * [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/)
-  * [Travertine](/minecraft/proxy/travertine/) Java
-  * [Velocity](/minecraft/proxy/velocity/)
-  * [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock
-  * [Waterfall](/minecraft/proxy/waterfall/)
+* [Proxies](/minecraft/proxy/) Minecraft Server Proxies
+  * [Java](/minecraft/proxy/java/)
+    * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/)
+    * [Waterfall](/minecraft/proxy/java/waterfall/)
+    * [Travertine](/minecraft/proxy/java/travertine/)
+    * [Velocity](/minecraft/proxy/java/velocity/)
+  * [Bedrock](/minecraft/proxy/bedrock/)
+    * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/)  
+    * [GeyserMC](/minecraft/proxy/bedrock/geyser/)
+  * [Cross Platform](/minecraft/proxy/cross_platform)
+    * [Waterdog](/minecraft/proxy/cross_platform/waterdog/)
+
 
 [OpenRA](/openra/)
 * [OpenRA Dune2000](/openra/openra_dune2000)
@@ -174,4 +179,4 @@ If you are reading this it looks like you are looking to add an egg to your serv
 
 [Xonotic](/xonotic/xonotic/)
 
-[Cryofall](/cryofall/)
\ No newline at end of file
+[Cryofall](/cryofall/)
diff --git a/minecraft/README.md b/minecraft/README.md
index fa00deba..9d3b4ed7 100644
--- a/minecraft/README.md
+++ b/minecraft/README.md
@@ -6,7 +6,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains,
 
 [Bedrock](/minecraft/bedrock/) Servers for Bedrock Minecraft (Windows 10, mobile, console)
 * [Bedrock](/minecraft/bedrock/bedrock/)
-* [DragonProxy](/minecraft/bedrock/dragon_proxy/)  
 * [Nukkit](/minecraft/bedrock/nukkit/)  
 * [PocketMine MP](/minecraft/bedrock/pocketmine_mp/)  
 
@@ -24,9 +23,14 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains,
 * [Tuinity](/minecraft/java/tuinity/)
 * [VanillaCord](/minecraft/java/vanillacord/)
 
-[Proxies](/minecraft/proxy/) Minecraft Server Proxies
-* [TyphoonLimbo](/minecraft/proxy/typhoonlimbo/) Java
-* [Travertine](/minecraft/proxy/travertine/) Java
-* [Velocity](/minecraft/proxy/velocity/) Java
-* [Waterdog](/minecraft/proxy/waterdog/) Java/Bedrock
-* [Waterfall](/minecraft/proxy/waterfall/) Java
\ No newline at end of file
+* [Proxies](/minecraft/proxy/) Minecraft Server Proxies
+  * [Java](/minecraft/proxy/java/)
+    * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/)
+    * [Waterfall](/minecraft/proxy/java/waterfall/)
+    * [Travertine](/minecraft/proxy/java/travertine/)
+    * [Velocity](/minecraft/proxy/java/velocity/)
+  * [Bedrock](/minecraft/proxy/bedrock/)
+    * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/)  
+    * [GeyserMC](/minecraft/proxy/bedrock/geyser/)
+  * [Cross Platform](/minecraft/proxy/cross_platform)
+    * [Waterdog](/minecraft/proxy/cross_platform/waterdog/)
diff --git a/minecraft/bedrock/README.md b/minecraft/bedrock/README.md
index 62935699..5dd20afa 100644
--- a/minecraft/bedrock/README.md
+++ b/minecraft/bedrock/README.md
@@ -4,10 +4,6 @@
 [Minecraft Bedrock Server](https://minecraft.net/en-us/download/server/bedrock/)
 The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server.
 
-#### DragonProxy
-[DragonProxy Github](https://github.com/DragonetMC/DragonProxy)
-A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers.
-
 #### Nukkit
 [Nukkit GitHub](https://github.com/Nukkit/Nukkit)  
 Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition  
diff --git a/minecraft/proxy/README.md b/minecraft/proxy/README.md
new file mode 100644
index 00000000..6be307ca
--- /dev/null
+++ b/minecraft/proxy/README.md
@@ -0,0 +1,12 @@
+# Minecraft Proxies
+
+* [Java](/minecraft/proxy/java/)
+  * [Waterfall](/minecraft/proxy/java/waterfall/)
+  * [Travertine](/minecraft/proxy/java/travertine/)
+  * [Velocity](/minecraft/proxy/java/velocity/)
+  * [TyphoonLimbo](/minecraft/proxy/java/typhoonlimbo/)
+* [Bedrock](/minecraft/proxy/bedrock/)
+  * [DragonProxy](/minecraft/proxy/bedrock/dragonproxy/) (Abandoned in favor of GeyserMC) 
+  * [GeyserMC](/minecraft/proxy/bedrock/geyser/)
+* [Cross Platform](/minecraft/proxy/cross_platform)
+  * [Waterdog](/minecraft/proxy/waterdog/)
diff --git a/minecraft/proxy/bedrock/README.md b/minecraft/proxy/bedrock/README.md
new file mode 100644
index 00000000..a8785174
--- /dev/null
+++ b/minecraft/proxy/bedrock/README.md
@@ -0,0 +1,9 @@
+# Bedrock Proxies/Bridges
+
+#### DragonProxy (Abandoned in favor of Geyser)
+[DragonProxy](https://github.com/DragonetMC/DragonProxy)
+A proxy to allow Minecraft: Bedrock clients to connect to Minecraft: Java Edition servers.
+
+#### GeyserMC
+[GeyserMC](https://geysermc.org/)
+A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition.
diff --git a/minecraft/bedrock/dragon_proxy/README.md b/minecraft/proxy/bedrock/dragon_proxy/README.md
similarity index 100%
rename from minecraft/bedrock/dragon_proxy/README.md
rename to minecraft/proxy/bedrock/dragon_proxy/README.md
diff --git a/minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json b/minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json
similarity index 100%
rename from minecraft/bedrock/dragon_proxy/egg-dragon-proxy.json
rename to minecraft/proxy/bedrock/dragon_proxy/egg-dragon-proxy.json
diff --git a/minecraft/proxy/bedrock/geyser/README.md b/minecraft/proxy/bedrock/geyser/README.md
new file mode 100644
index 00000000..10c01c34
--- /dev/null
+++ b/minecraft/proxy/bedrock/geyser/README.md
@@ -0,0 +1,6 @@
+# Geyser
+
+A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition.
+
+### Eggs
+GeyserMC maintains their own eggs on their github: [GeyserMC pterodactyl eggs](https://github.com/GeyserMC/pterodactyl-stuff)
diff --git a/minecraft/proxy/cross_platform/README.md b/minecraft/proxy/cross_platform/README.md
new file mode 100644
index 00000000..8b4cedc8
--- /dev/null
+++ b/minecraft/proxy/cross_platform/README.md
@@ -0,0 +1,5 @@
+# Mineraft Cross Platform Proxies
+
+#### Waterdog
+[Waterdog](https://github.com/yesdog/Waterdog)
+Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others.
\ No newline at end of file
diff --git a/minecraft/proxy/waterdog/README.md b/minecraft/proxy/cross_platform/waterdog/README.md
similarity index 100%
rename from minecraft/proxy/waterdog/README.md
rename to minecraft/proxy/cross_platform/waterdog/README.md
diff --git a/minecraft/proxy/waterdog/egg-waterdog.json b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
similarity index 93%
rename from minecraft/proxy/waterdog/egg-waterdog.json
rename to minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
index 007dc04b..e366448e 100644
--- a/minecraft/proxy/waterdog/egg-waterdog.json
+++ b/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n    echo -e \"adding.jar to server file name\"\r\n    SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n    echo -e \"downloading latest waterdog build\\n\"\r\n    curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/lastSuccessfulBuild\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nelse \r\n    echo -e \"downloading waterdog build ${WATERDOG_VERSION}\\n\"\r\n    curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/${WATERDOG_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n    echo -e \"Downloading waterfall config.yml\"\r\n   curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_proxy\/waterfall\/config.yml\r\nelse\r\n    echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi",
+            "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n    echo -e \"adding.jar to server file name\"\r\n    SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n    echo -e \"downloading latest waterdog build\\n\"\r\n    curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/lastSuccessfulBuild\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nelse \r\n    echo -e \"downloading waterdog build ${WATERDOG_VERSION}\\n\"\r\n    curl -sSL -o ${SERVER_JARFILE} https:\/\/ci.codemc.io\/job\/yesdog\/job\/Waterdog\/${WATERDOG_VERSION}\/artifact\/Waterfall-Proxy\/bootstrap\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n    echo -e \"Downloading waterfall config.yml\"\r\n   curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/cross_platform\/waterfall\/config.yml\r\nelse\r\n    echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
diff --git a/minecraft/proxy/java/README.md b/minecraft/proxy/java/README.md
new file mode 100644
index 00000000..920b9918
--- /dev/null
+++ b/minecraft/proxy/java/README.md
@@ -0,0 +1,17 @@
+# Minecraft Java Proxies
+
+#### Waterfall
+[Waterfall](https://papermc.io/downloads#Waterfall)
+Paper fork of the BungeeCord software, with improved Forge support and more features.
+
+#### Travertine
+[Travertine](https://papermc.io/downloads#Travertine)
+Waterfall, with additional support for Minecraft 1.7.10. 
+
+#### Velocity
+[Velocity](https://velocitypowered.com/)
+Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility. 
+
+#### Typhoonlimbo
+[TyphoonLimbo](https://github.com/TyphoonMC/TyphoonLimbo)
+Lightweight Minecraft limbo server  
diff --git a/minecraft/proxy/travertine/README.md b/minecraft/proxy/java/travertine/README.md
similarity index 100%
rename from minecraft/proxy/travertine/README.md
rename to minecraft/proxy/java/travertine/README.md
diff --git a/minecraft/proxy/travertine/egg-travertine.json b/minecraft/proxy/java/travertine/egg-travertine.json
similarity index 97%
rename from minecraft/proxy/travertine/egg-travertine.json
rename to minecraft/proxy/java/travertine/egg-travertine.json
index 904e4fb9..053189f1 100644
--- a/minecraft/proxy/travertine/egg-travertine.json
+++ b/minecraft/proxy/java/travertine/egg-travertine.json
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n    echo -e \"using supplied download url\"\r\n    DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n    if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n        echo -e \"getting latest supported mc version and latest paper build\"\r\n        MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n        VER_EXISTS=true\r\n    else\r\n        echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n        VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n    fi\r\n    \r\n    if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n        echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n    else\r\n        echo -e \"Using the latest travertine version\"\r\n        MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n    fi\r\n    \r\n    BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n    \r\n    if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n        echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n    else\r\n        echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n    fi\r\n    \r\n    echo \"Version being downloaded\"\r\n    echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n    echo -e \"Build: ${BUILD_NUMBER}\"\r\n    DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n    SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n    echo -e \"Downloading travertine config.yml\"\r\n   curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/travertine\/config.yml\r\nelse\r\n    echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi",
+            "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n    echo -e \"using supplied download url\"\r\n    DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n    if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n        echo -e \"getting latest supported mc version and latest paper build\"\r\n        MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n        VER_EXISTS=true\r\n    else\r\n        echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n        VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n    fi\r\n    \r\n    if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n        echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n    else\r\n        echo -e \"Using the latest travertine version\"\r\n        MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/travertine | jq -r '.versions[0]')\r\n    fi\r\n    \r\n    BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n    \r\n    if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n        echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n    else\r\n        echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n    fi\r\n    \r\n    echo \"Version being downloaded\"\r\n    echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n    echo -e \"Build: ${BUILD_NUMBER}\"\r\n    DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/travertine\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n    SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n    echo -e \"Downloading travertine config.yml\"\r\n   curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/travertine\/config.yml\r\nelse\r\n    echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
diff --git a/minecraft/proxy/typhoonlimbo/README.md b/minecraft/proxy/java/typhoonlimbo/README.md
similarity index 100%
rename from minecraft/proxy/typhoonlimbo/README.md
rename to minecraft/proxy/java/typhoonlimbo/README.md
diff --git a/minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json b/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
similarity index 100%
rename from minecraft/proxy/typhoonlimbo/egg-typhoon-limbo.json
rename to minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
diff --git a/minecraft/proxy/velocity/README.md b/minecraft/proxy/java/velocity/README.md
similarity index 100%
rename from minecraft/proxy/velocity/README.md
rename to minecraft/proxy/java/velocity/README.md
diff --git a/minecraft/proxy/velocity/egg-velocity.json b/minecraft/proxy/java/velocity/egg-velocity.json
similarity index 96%
rename from minecraft/proxy/velocity/egg-velocity.json
rename to minecraft/proxy/java/velocity/egg-velocity.json
index 7cfc2206..b8c44495 100644
--- a/minecraft/proxy/velocity/egg-velocity.json
+++ b/minecraft/proxy/java/velocity/egg-velocity.json
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\/lastStableBuild\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/ci.velocitypowered.com\/job\/velocity\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/ci.velocitypowered.com\/job\/velocity\/lastStableBuild\/${DOWNLOAD_ENDPOINT}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n    echo -e \"velocity config file exists\"\r\nelse\r\n    echo -e \"downloading velocity config file.\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"",
+            "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\/lastStableBuild\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_ENDPOINT=$(curl https:\/\/ci.velocitypowered.com\/job\/velocity\/${VELOCITY_VERSION}\/ | grep -Eo 'href=\"[^\\\"]+\"' | grep -vE \"view|fingerprint\" | grep \".jar\" | sed -n 's\/.*href=\"\\([^\"]*\\).*\/\\1\/p')\r\nDOWNLOAD_LINK=https:\/\/ci.velocitypowered.com\/job\/velocity\/lastStableBuild\/${DOWNLOAD_ENDPOINT}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n    echo -e \"velocity config file exists\"\r\nelse\r\n    echo -e \"downloading velocity config file.\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/proxy\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"",
             "container": "alpine:3.10",
             "entrypoint": "ash"
         }
diff --git a/minecraft/proxy/velocity/velocity.toml b/minecraft/proxy/java/velocity/velocity.toml
similarity index 100%
rename from minecraft/proxy/velocity/velocity.toml
rename to minecraft/proxy/java/velocity/velocity.toml
diff --git a/minecraft/proxy/waterfall/README.md b/minecraft/proxy/java/waterfall/README.md
similarity index 100%
rename from minecraft/proxy/waterfall/README.md
rename to minecraft/proxy/java/waterfall/README.md
diff --git a/minecraft/proxy/waterfall/config.yml b/minecraft/proxy/java/waterfall/config.yml
similarity index 100%
rename from minecraft/proxy/waterfall/config.yml
rename to minecraft/proxy/java/waterfall/config.yml
diff --git a/minecraft/proxy/waterfall/egg-waterfall.json b/minecraft/proxy/java/waterfall/egg-waterfall.json
similarity index 96%
rename from minecraft/proxy/waterfall/egg-waterfall.json
rename to minecraft/proxy/java/waterfall/egg-waterfall.json
index 1454f996..66426366 100644
--- a/minecraft/proxy/waterfall/egg-waterfall.json
+++ b/minecraft/proxy/java/waterfall/egg-waterfall.json
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n    echo -e \"using supplied download url\"\r\n    DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n    if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n        echo -e \"getting latest supported mc version and latest paper build\"\r\n        MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n        VER_EXISTS=true\r\n    else\r\n        echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n        VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n    fi\r\n    \r\n    if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n        echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n    else\r\n        echo -e \"Using the latest waterfall version\"\r\n        MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n    fi\r\n    \r\n    BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n    \r\n    if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n        echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n    else\r\n        echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n    fi\r\n    \r\n    echo \"Version being downloaded\"\r\n    echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n    echo -e \"Build: ${BUILD_NUMBER}\"\r\n    DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n    SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n    echo -e \"Downloading waterfall config.yml\"\r\n   curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/waterfall\/config.yml\r\nelse\r\n    echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi",
+            "script": "#!\/bin\/bash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nmkdir -p \/mnt\/server\/\r\ncd \/mnt\/server\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n    echo -e \"using supplied download url\"\r\n    DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n    if [ -z \"$VANILLA_VERSION\" ] || [ \"${MINECRAFT_VERSION}\" == \"latest\" ]; then\r\n        echo -e \"getting latest supported mc version and latest paper build\"\r\n        MINECRAFT_VERSION=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r '.versions[0]')\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n        VER_EXISTS=true\r\n    else\r\n        echo -e \"checking if version ${MINECRAFT_VERSION} exists\"\r\n        VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v1\/waterfall | jq -r --arg VERSION ${MINECRAFT_VERSION} '.versions[] | contains($VERSION)' | grep true)\r\n    fi\r\n    \r\n    if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n        echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n    else\r\n        echo -e \"Using the latest waterfall version\"\r\n        MINECRAFT_VERSION=${LATEST_WATERFALL_VERSION}\r\n    fi\r\n    \r\n    BUILD_EXISTS=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | contains($BUILD)' | grep true)\r\n    \r\n    if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n        echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n    else\r\n        echo -e \"Using the latest paper build for version ${MINECRAFT_VERSION}\"\r\n        BUILD_NUMBER=$(curl -sSL https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION} | jq -r '.builds.latest')\r\n    fi\r\n    \r\n    echo \"Version being downloaded\"\r\n    echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n    echo -e \"Build: ${BUILD_NUMBER}\"\r\n    DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/waterfall\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\nfi\r\n\r\nif [ -z ${SERVER_JARFILE} ]; then\r\n    SERVER_JARFILE=server.jar\r\nfi\r\n\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f config.yml ]; then\r\n    echo -e \"Downloading waterfall config.yml\"\r\n   curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/proxy\/java\/waterfall\/config.yml\r\nelse\r\n    echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }