diff --git a/ackhandlernew/ackhandler_suite_test.go b/ackhandler/ackhandler_suite_test.go
similarity index 89%
rename from ackhandlernew/ackhandler_suite_test.go
rename to ackhandler/ackhandler_suite_test.go
index 3c4bb043..94589bef 100644
--- a/ackhandlernew/ackhandler_suite_test.go
+++ b/ackhandler/ackhandler_suite_test.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	. "github.com/onsi/ginkgo"
diff --git a/ackhandlernew/interfaces.go b/ackhandler/interfaces.go
similarity index 98%
rename from ackhandlernew/interfaces.go
rename to ackhandler/interfaces.go
index 5f025807..228e0d12 100644
--- a/ackhandlernew/interfaces.go
+++ b/ackhandler/interfaces.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"time"
diff --git a/ackhandlernew/packet.go b/ackhandler/packet.go
similarity index 98%
rename from ackhandlernew/packet.go
rename to ackhandler/packet.go
index ddcca81f..68f50fc4 100644
--- a/ackhandlernew/packet.go
+++ b/ackhandler/packet.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"time"
diff --git a/ackhandlernew/packet_test.go b/ackhandler/packet_test.go
similarity index 99%
rename from ackhandlernew/packet_test.go
rename to ackhandler/packet_test.go
index e6b9a868..2e6e7546 100644
--- a/ackhandlernew/packet_test.go
+++ b/ackhandler/packet_test.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"github.com/lucas-clemente/quic-go/frames"
diff --git a/ackhandlernew/received_packet_handler.go b/ackhandler/received_packet_handler.go
similarity index 99%
rename from ackhandlernew/received_packet_handler.go
rename to ackhandler/received_packet_handler.go
index 650a1f91..d344f0f1 100644
--- a/ackhandlernew/received_packet_handler.go
+++ b/ackhandler/received_packet_handler.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"errors"
diff --git a/ackhandlernew/received_packet_handler_test.go b/ackhandler/received_packet_handler_test.go
similarity index 99%
rename from ackhandlernew/received_packet_handler_test.go
rename to ackhandler/received_packet_handler_test.go
index 8c31e3da..2fa3837a 100644
--- a/ackhandlernew/received_packet_handler_test.go
+++ b/ackhandler/received_packet_handler_test.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"time"
diff --git a/ackhandlernew/received_packet_history.go b/ackhandler/received_packet_history.go
similarity index 99%
rename from ackhandlernew/received_packet_history.go
rename to ackhandler/received_packet_history.go
index 1e417ed6..14bb08f5 100644
--- a/ackhandlernew/received_packet_history.go
+++ b/ackhandler/received_packet_history.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"sync"
diff --git a/ackhandlernew/received_packet_history_test.go b/ackhandler/received_packet_history_test.go
similarity index 99%
rename from ackhandlernew/received_packet_history_test.go
rename to ackhandler/received_packet_history_test.go
index 7f8f0ca0..f2f89e50 100644
--- a/ackhandlernew/received_packet_history_test.go
+++ b/ackhandler/received_packet_history_test.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"github.com/lucas-clemente/quic-go/frames"
diff --git a/ackhandlernew/sent_packet_handler.go b/ackhandler/sent_packet_handler.go
similarity index 99%
rename from ackhandlernew/sent_packet_handler.go
rename to ackhandler/sent_packet_handler.go
index b61bbc7c..87a0690c 100644
--- a/ackhandlernew/sent_packet_handler.go
+++ b/ackhandler/sent_packet_handler.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"errors"
diff --git a/ackhandlernew/sent_packet_handler_test.go b/ackhandler/sent_packet_handler_test.go
similarity index 99%
rename from ackhandlernew/sent_packet_handler_test.go
rename to ackhandler/sent_packet_handler_test.go
index 35bc46cc..0b49cd08 100644
--- a/ackhandlernew/sent_packet_handler_test.go
+++ b/ackhandler/sent_packet_handler_test.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"time"
diff --git a/ackhandlernew/stop_waiting_manager.go b/ackhandler/stop_waiting_manager.go
similarity index 99%
rename from ackhandlernew/stop_waiting_manager.go
rename to ackhandler/stop_waiting_manager.go
index 38b9564b..a7290434 100644
--- a/ackhandlernew/stop_waiting_manager.go
+++ b/ackhandler/stop_waiting_manager.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"github.com/lucas-clemente/quic-go/frames"
diff --git a/ackhandlernew/stop_waiting_manager_test.go b/ackhandler/stop_waiting_manager_test.go
similarity index 99%
rename from ackhandlernew/stop_waiting_manager_test.go
rename to ackhandler/stop_waiting_manager_test.go
index 0bc44719..962d75b0 100644
--- a/ackhandlernew/stop_waiting_manager_test.go
+++ b/ackhandler/stop_waiting_manager_test.go
@@ -1,4 +1,4 @@
-package ackhandlernew
+package ackhandler
 
 import (
 	"github.com/lucas-clemente/quic-go/protocol"