diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
index 7bc87a97..3ca4d3f5 100644
--- a/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
+++ b/src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
@@ -19,6 +19,7 @@ package de.florianmichael.viafabricplus;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import de.florianmichael.viafabricplus.base.file.ViaJarReplacer;
 import de.florianmichael.viafabricplus.base.event.FinishMinecraftLoadCallback;
 import de.florianmichael.viafabricplus.base.event.PreLoadCallback;
 import de.florianmichael.viafabricplus.base.settings.SettingsSystem;
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/FileSaver.java b/src/main/java/de/florianmichael/viafabricplus/base/file/FileSaver.java
similarity index 97%
rename from src/main/java/de/florianmichael/viafabricplus/base/FileSaver.java
rename to src/main/java/de/florianmichael/viafabricplus/base/file/FileSaver.java
index 03ad36d4..a24ff581 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/FileSaver.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/file/FileSaver.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.florianmichael.viafabricplus.base;
+package de.florianmichael.viafabricplus.base.file;
 
 import com.google.gson.JsonObject;
 import de.florianmichael.viafabricplus.ViaFabricPlus;
diff --git a/src/main/java/de/florianmichael/viafabricplus/ViaJarReplacer.java b/src/main/java/de/florianmichael/viafabricplus/base/file/ViaJarReplacer.java
similarity index 95%
rename from src/main/java/de/florianmichael/viafabricplus/ViaJarReplacer.java
rename to src/main/java/de/florianmichael/viafabricplus/base/file/ViaJarReplacer.java
index df1838ca..993a7d63 100644
--- a/src/main/java/de/florianmichael/viafabricplus/ViaJarReplacer.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/file/ViaJarReplacer.java
@@ -15,8 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package de.florianmichael.viafabricplus;
+package de.florianmichael.viafabricplus.base.file;
 
+import de.florianmichael.viafabricplus.ViaFabricPlus;
 import net.lenni0451.reflect.ClassLoaders;
 import net.lenni0451.reflect.stream.RStream;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/base/settings/SettingsSystem.java b/src/main/java/de/florianmichael/viafabricplus/base/settings/SettingsSystem.java
index 6ddc37cb..ba5502a6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/base/settings/SettingsSystem.java
+++ b/src/main/java/de/florianmichael/viafabricplus/base/settings/SettingsSystem.java
@@ -22,7 +22,7 @@ import de.florianmichael.viafabricplus.base.event.InitializeSettingsCallback;
 import de.florianmichael.viafabricplus.base.settings.base.AbstractSetting;
 import de.florianmichael.viafabricplus.base.settings.base.SettingGroup;
 import de.florianmichael.viafabricplus.base.settings.groups.*;
-import de.florianmichael.viafabricplus.base.FileSaver;
+import de.florianmichael.viafabricplus.base.file.FileSaver;
 import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
 import net.raphimc.vialoader.util.VersionEnum;
 
diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java b/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java
index 30924305..bff169e6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/bedrock/BedrockAccountHandler.java
@@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.definition.bedrock;
 
 import com.google.gson.JsonObject;
 import de.florianmichael.viafabricplus.ViaFabricPlus;
-import de.florianmichael.viafabricplus.base.FileSaver;
+import de.florianmichael.viafabricplus.base.file.FileSaver;
 import net.raphimc.mcauth.MinecraftAuth;
 import net.raphimc.mcauth.step.bedrock.StepMCChain;
 import net.raphimc.mcauth.step.bedrock.StepPlayFabToken;
diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/classic/ClassiCubeAccountHandler.java b/src/main/java/de/florianmichael/viafabricplus/definition/classic/ClassiCubeAccountHandler.java
index 0fed3768..5b1888c6 100644
--- a/src/main/java/de/florianmichael/viafabricplus/definition/classic/ClassiCubeAccountHandler.java
+++ b/src/main/java/de/florianmichael/viafabricplus/definition/classic/ClassiCubeAccountHandler.java
@@ -21,7 +21,7 @@ import com.google.gson.JsonObject;
 import de.florianmichael.classic4j.model.classicube.highlevel.CCAccount;
 import de.florianmichael.viafabricplus.base.event.DisconnectConnectionCallback;
 import de.florianmichael.viafabricplus.protocolhack.provider.vialegacy.ViaFabricPlusClassicMPPassProvider;
-import de.florianmichael.viafabricplus.base.FileSaver;
+import de.florianmichael.viafabricplus.base.file.FileSaver;
 
 public class ClassiCubeAccountHandler extends FileSaver {
     public static ClassiCubeAccountHandler INSTANCE;
diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_20to1_19_4/MixinInventoryPackets.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_20to1_19_4/MixinInventoryPackets.java
index cf26ede4..07b1ad85 100644
--- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_20to1_19_4/MixinInventoryPackets.java
+++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/protocol1_20to1_19_4/MixinInventoryPackets.java
@@ -39,7 +39,7 @@ public class MixinInventoryPackets extends ItemRewriter<ClientboundPackets1_19_4
 
     @Inject(method = "registerPackets", at = @At("RETURN"))
     public void handleLegacySmithingScreen(CallbackInfo ci) {
-        protocol.registerClientbound(ClientboundPackets1_19_4.OPEN_WINDOW, wrapper -> {
+        protocol.registerClientbound(ClientboundPackets1_19_4.OPEN_WINDOW, ClientboundPackets1_19_4.OPEN_WINDOW, wrapper -> {
             final var windowId = wrapper.read(Type.VAR_INT);
             final int typeId = wrapper.read(Type.VAR_INT);
             var title = wrapper.read(Type.COMPONENT);
@@ -53,6 +53,6 @@ public class MixinInventoryPackets extends ItemRewriter<ClientboundPackets1_19_4
                 wrapper.write(Type.VAR_INT, windowId);
                 wrapper.write(Type.COMPONENT, title);
             }
-        });
+        }, true);
     }
 }