diff --git a/common/csrand/csrand.go b/common/csrand/csrand.go
index 84ce375c2e8b0257bed0960d627ce6ae7d87083f..ad249fa45b09d10dbb84ea53e7f5e456c5db9520 100644
--- a/common/csrand/csrand.go
+++ b/common/csrand/csrand.go
@@ -31,7 +31,7 @@
 // Not all of the convinience routines are replicated, only those that are
 // immediately useful.  The Rand variable provides access to the full math/rand
 // API.
-package csrand // import "0xacab.org/leap/obfs4-deprecated/common/csrand"
+package csrand // import "0xacab.org/leap/obfs4deprecated/common/csrand"
 
 import (
 	cryptRand "crypto/rand"
diff --git a/common/drbg/hash_drbg.go b/common/drbg/hash_drbg.go
index 0f93513342c5c0e8040735bc41ee9b4fa80df818..362143769b4cd446cffe9a1b0bcc8281f81a879d 100644
--- a/common/drbg/hash_drbg.go
+++ b/common/drbg/hash_drbg.go
@@ -27,7 +27,7 @@
 
 // Package drbg implements a minimalistic DRBG based off SipHash-2-4 in OFB
 // mode.
-package drbg // import "0xacab.org/leap/obfs4-deprecated/common/drbg"
+package drbg // import "0xacab.org/leap/obfs4deprecated/common/drbg"
 
 import (
 	"encoding/binary"
@@ -35,7 +35,7 @@ import (
 	"fmt"
 	"hash"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
 	"github.com/dchest/siphash"
 )
 
diff --git a/common/log/log.go b/common/log/log.go
index 2ec0160e844c9c65b4985b7153d9e7ee170b06d1..0ac004d8ad0b8ad2c16add9b2d6372eeadbf9bcb 100644
--- a/common/log/log.go
+++ b/common/log/log.go
@@ -27,7 +27,7 @@
 
 // Package log implements a simple set of leveled logging wrappers around the
 // standard log package.
-package log // import "0xacab.org/leap/obfs4-deprecated/common/log"
+package log // import "0xacab.org/leap/obfs4deprecated/common/log"
 
 import (
 	"fmt"
diff --git a/common/ntor/ntor.go b/common/ntor/ntor.go
index 4f2bb932b5debd669cb362f4938d2557db754d73..b07fa113f5c4b16c600560d34ea0cf4f1ef71ef9 100644
--- a/common/ntor/ntor.go
+++ b/common/ntor/ntor.go
@@ -32,7 +32,7 @@
 //
 // Before using this package, it is strongly recommended that the specification
 // is read and understood.
-package ntor // import "0xacab.org/leap/obfs4-deprecated/common/ntor"
+package ntor // import "0xacab.org/leap/obfs4deprecated/common/ntor"
 
 import (
 	"bytes"
@@ -46,8 +46,8 @@ import (
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/hkdf"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/internal/extra25519"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/internal/extra25519"
 )
 
 const (
diff --git a/common/probdist/weighted_dist.go b/common/probdist/weighted_dist.go
index e0f9ef188e749ceb187d2944281bc24948a54b9b..10ceca722aeadfda0449498e64e402bdbf1d3f90 100644
--- a/common/probdist/weighted_dist.go
+++ b/common/probdist/weighted_dist.go
@@ -28,7 +28,7 @@
 // Package probdist implements a weighted probability distribution suitable for
 // protocol parameterization.  To allow for easy reproduction of a given
 // distribution, the drbg package is used as the random number source.
-package probdist // import "0xacab.org/leap/obfs4-deprecated/common/probdist"
+package probdist // import "0xacab.org/leap/obfs4deprecated/common/probdist"
 
 import (
 	"bytes"
@@ -37,8 +37,8 @@ import (
 	"math/rand"
 	"sync"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/common/drbg"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/drbg"
 )
 
 const (
diff --git a/common/probdist/weighted_dist_test.go b/common/probdist/weighted_dist_test.go
index 29738465b68789c60501d09d02ec531d711ef033..e0d2dd1dfcfa20c7c318510f2ed8febca8946111 100644
--- a/common/probdist/weighted_dist_test.go
+++ b/common/probdist/weighted_dist_test.go
@@ -31,7 +31,7 @@ import (
 	"fmt"
 	"testing"
 
-	"0xacab.org/leap/obfs4-deprecated/common/drbg"
+	"0xacab.org/leap/obfs4deprecated/common/drbg"
 )
 
 const debug = false
diff --git a/common/replayfilter/replay_filter.go b/common/replayfilter/replay_filter.go
index 919bfe496cd8740e948f518d75073d9fd42dbd33..7a6d2b50f6fa21d8bac5d8f9251532cb2f1f8849 100644
--- a/common/replayfilter/replay_filter.go
+++ b/common/replayfilter/replay_filter.go
@@ -30,7 +30,7 @@
 // has been seen before based on the SipHash-2-4 digest of the sequence.
 // Collisions are treated as positive matches, though the probability of this
 // happening is negligible.
-package replayfilter // import "0xacab.org/leap/obfs4-deprecated/common/replayfilter"
+package replayfilter // import "0xacab.org/leap/obfs4deprecated/common/replayfilter"
 
 import (
 	"container/list"
@@ -38,7 +38,7 @@ import (
 	"sync"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
 	"github.com/dchest/siphash"
 )
 
diff --git a/common/socks5/socks5.go b/common/socks5/socks5.go
index 66c28e71a074ab4740684b3a59c5caedfbf96927..17d12ce4e0a15b45b13badafec1c74d033d0d46d 100644
--- a/common/socks5/socks5.go
+++ b/common/socks5/socks5.go
@@ -35,7 +35,7 @@
 //   - The authentication provided by the client is always accepted as it is
 //     used as a channel to pass information rather than for authentication for
 //     pluggable transports.
-package socks5 // import "0xacab.org/leap/obfs4-deprecated/common/socks5"
+package socks5 // import "0xacab.org/leap/obfs4deprecated/common/socks5"
 
 import (
 	"bufio"
diff --git a/common/uniformdh/uniformdh.go b/common/uniformdh/uniformdh.go
index 4b34789588d5e7a74bda24ce1f17f0395b75f8a0..70e3f7c72578e2081a1cb04d21fec4ad7d8e1740 100644
--- a/common/uniformdh/uniformdh.go
+++ b/common/uniformdh/uniformdh.go
@@ -29,7 +29,7 @@
 // mechanism as defined in the obfs3 protocol specification.  This
 // implementation is suitable for obfuscation but MUST NOT BE USED when strong
 // security is required as it is not constant time.
-package uniformdh // import "0xacab.org/leap/obfs4-deprecated/common/uniformdh"
+package uniformdh // import "0xacab.org/leap/obfs4deprecated/common/uniformdh"
 
 import (
 	"fmt"
diff --git a/internal/extra25519/extra25519.go b/internal/extra25519/extra25519.go
index 2ceec268ddee89909697592202decff2091b5539..332abf6606efe58c8202d8090b54261d226c2a4e 100644
--- a/internal/extra25519/extra25519.go
+++ b/internal/extra25519/extra25519.go
@@ -4,7 +4,7 @@
 
 package extra25519
 
-import "0xacab.org/leap/obfs4-deprecated/internal/edwards25519"
+import "0xacab.org/leap/obfs4deprecated/internal/edwards25519"
 
 // sqrtMinusAPlus2 is sqrt(-(486662+2))
 var sqrtMinusAPlus2 = edwards25519.FieldElement{
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index 1ccf78df4bb06c429b58a404b20e8f03b296b62e..e6bdb97e5f54621081f5f19492d53aa136a284b1 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -41,10 +41,10 @@ import (
 	"sync"
 	"syscall"
 
-	"0xacab.org/leap/obfs4-deprecated/common/log"
-	"0xacab.org/leap/obfs4-deprecated/common/socks5"
-	"0xacab.org/leap/obfs4-deprecated/transports"
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/common/log"
+	"0xacab.org/leap/obfs4deprecated/common/socks5"
+	"0xacab.org/leap/obfs4deprecated/transports"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 	"golang.org/x/net/proxy"
 )
diff --git a/obfs4proxy/termmon.go b/obfs4proxy/termmon.go
index 5869564ed763e5fdb6b888f3377e1f6ecf5ab332..f0c130e81cb1c22ac1e8242225a75ba365f06c78 100644
--- a/obfs4proxy/termmon.go
+++ b/obfs4proxy/termmon.go
@@ -36,7 +36,7 @@ import (
 	"syscall"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/log"
+	"0xacab.org/leap/obfs4deprecated/common/log"
 )
 
 var termMonitorOSInit func(*termMonitor) error
diff --git a/transports/base/base.go b/transports/base/base.go
index c77e163eaa436b75ce51dd9ad240537e64cab676..101da58d752331eabbfa29ea770d61f7e15b1d9d 100644
--- a/transports/base/base.go
+++ b/transports/base/base.go
@@ -27,7 +27,7 @@
 
 // Package base provides the common interface that each supported transport
 // protocol must implement.
-package base // import "0xacab.org/leap/obfs4-deprecated/transports/base"
+package base // import "0xacab.org/leap/obfs4deprecated/transports/base"
 
 import (
 	"net"
diff --git a/transports/meeklite/base.go b/transports/meeklite/base.go
index 3f28a8d91f94848dcf1c420573dd739e2b0c3b98..be7eefdb4d37099f73de3e8e758efdf640f67415 100644
--- a/transports/meeklite/base.go
+++ b/transports/meeklite/base.go
@@ -30,13 +30,13 @@
 // made to normalize the TLS fingerprint.
 //
 // It borrows quite liberally from the real meek-client code.
-package meeklite // import "0xacab.org/leap/obfs4-deprecated/transports/meeklite"
+package meeklite // import "0xacab.org/leap/obfs4deprecated/transports/meeklite"
 
 import (
 	"fmt"
 	"net"
 
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 )
 
diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go
index 47bfa803b408f05475d2c66b6d8f73b8006021f1..149b091f9b2cc528bd67c1072655e479a438d498 100644
--- a/transports/meeklite/meek.go
+++ b/transports/meeklite/meek.go
@@ -45,7 +45,7 @@ import (
 	"sync"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 	utls "gitlab.com/yawning/utls.git"
 )
diff --git a/transports/meeklite/transport.go b/transports/meeklite/transport.go
index c9f13a152a7a0d900902ef0e6db247af9de796b8..bd80da94a3468fd983db469dcb667b7cbf6e6ae5 100644
--- a/transports/meeklite/transport.go
+++ b/transports/meeklite/transport.go
@@ -29,8 +29,8 @@ import (
 	"strings"
 	"sync"
 
-	"0xacab.org/leap/obfs4-deprecated/common/log"
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/common/log"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
 	utls "gitlab.com/yawning/utls.git"
 	"golang.org/x/net/http2"
 )
diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go
index 18ce43934e54eee8ffcf2605d3233265ac56b1ad..c3096a0bbd683bbfeb8b7c1ba6df80c99a082d27 100644
--- a/transports/obfs2/obfs2.go
+++ b/transports/obfs2/obfs2.go
@@ -28,7 +28,7 @@
 // Package obfs2 provides an implementation of the Tor Project's obfs2
 // obfuscation protocol.  This protocol is considered trivially broken by most
 // sophisticated adversaries.
-package obfs2 // import "0xacab.org/leap/obfs4-deprecated/transports/obfs2"
+package obfs2 // import "0xacab.org/leap/obfs4deprecated/transports/obfs2"
 
 import (
 	"crypto/aes"
@@ -40,8 +40,8 @@ import (
 	"net"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 )
 
diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go
index a6318104f6a50689eaaf183dd8ef79a16f7cc675..06dea9cce400d41c29057cff31ebd572a5e80b00 100644
--- a/transports/obfs3/obfs3.go
+++ b/transports/obfs3/obfs3.go
@@ -27,7 +27,7 @@
 
 // Package obfs3 provides an implementation of the Tor Project's obfs3
 // obfuscation protocol.
-package obfs3 // import "0xacab.org/leap/obfs4-deprecated/transports/obfs3"
+package obfs3 // import "0xacab.org/leap/obfs4deprecated/transports/obfs3"
 
 import (
 	"bytes"
@@ -40,9 +40,9 @@ import (
 	"net"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/common/uniformdh"
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/uniformdh"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 )
 
diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4deprecated/framing/framing.go
similarity index 98%
rename from transports/obfs4/framing/framing.go
rename to transports/obfs4deprecated/framing/framing.go
index d443fe0752d458a2ebe6c67440828e701bc47949..39dcef869db2983b45aad7fdd4264237da6c20ae 100644
--- a/transports/obfs4/framing/framing.go
+++ b/transports/obfs4deprecated/framing/framing.go
@@ -59,7 +59,7 @@
 // transmitted over the wire as both sides of the conversation know the prefix
 // and the initial counter value.  It is imperative that the counter does not
 // wrap, and sessions MUST terminate before 2^64 frames are sent.
-package framing // import "0xacab.org/leap/obfs4-deprecated/transports/obfs4/framing"
+package framing // import "0xacab.org/leap/obfs4deprecated/transports/obfs4deprecated/framing"
 
 import (
 	"bytes"
@@ -68,8 +68,8 @@ import (
 	"fmt"
 	"io"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/common/drbg"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/drbg"
 	"golang.org/x/crypto/nacl/secretbox"
 )
 
diff --git a/transports/obfs4/framing/framing_test.go b/transports/obfs4deprecated/framing/framing_test.go
similarity index 100%
rename from transports/obfs4/framing/framing_test.go
rename to transports/obfs4deprecated/framing/framing_test.go
diff --git a/transports/obfs4/handshake_ntor.go b/transports/obfs4deprecated/handshake_ntor.go
similarity index 98%
rename from transports/obfs4/handshake_ntor.go
rename to transports/obfs4deprecated/handshake_ntor.go
index 6d3e5c3a6056afd9e66c9348fc0e544ba5efcd8a..804df3b86514923327a9de60b9fb94472c16383a 100644
--- a/transports/obfs4/handshake_ntor.go
+++ b/transports/obfs4deprecated/handshake_ntor.go
@@ -38,10 +38,10 @@ import (
 	"strconv"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/common/ntor"
-	"0xacab.org/leap/obfs4-deprecated/common/replayfilter"
-	"0xacab.org/leap/obfs4-deprecated/transports/obfs4/framing"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/ntor"
+	"0xacab.org/leap/obfs4deprecated/common/replayfilter"
+	"0xacab.org/leap/obfs4deprecated/transports/obfs4deprecated/framing"
 )
 
 const (
diff --git a/transports/obfs4/handshake_ntor_test.go b/transports/obfs4deprecated/handshake_ntor_test.go
similarity index 98%
rename from transports/obfs4/handshake_ntor_test.go
rename to transports/obfs4deprecated/handshake_ntor_test.go
index 5c7bfe1acbcca0d80a0293237d8e26198b638471..db7a9763f3ddbf639f514e9a068b9a8b964b2580 100644
--- a/transports/obfs4/handshake_ntor_test.go
+++ b/transports/obfs4deprecated/handshake_ntor_test.go
@@ -25,14 +25,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package obfs4
+package obfs4deprecated
 
 import (
 	"bytes"
 	"testing"
 
-	"0xacab.org/leap/obfs4-deprecated/common/ntor"
-	"0xacab.org/leap/obfs4-deprecated/common/replayfilter"
+	"0xacab.org/leap/obfs4deprecated/common/ntor"
+	"0xacab.org/leap/obfs4deprecated/common/replayfilter"
 )
 
 func TestHandshakeNtorClient(t *testing.T) {
diff --git a/transports/obfs4/obfs4.go b/transports/obfs4deprecated/obfs4.go
similarity index 97%
rename from transports/obfs4/obfs4.go
rename to transports/obfs4deprecated/obfs4.go
index fe5f8414da1678675caec5296c92a3ed0e16b101..49599abcd8a2a303bfda39d142aa26d012e64068 100644
--- a/transports/obfs4/obfs4.go
+++ b/transports/obfs4deprecated/obfs4.go
@@ -25,9 +25,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-// Package obfs4 provides an implementation of the Tor Project's obfs4
+// package obfs4deprecated provides an implementation of the Tor Project's obfs4
 // obfuscation protocol.
-package obfs4 // import "0xacab.org/leap/obfs4-deprecated/transports/obfs4"
+package obfs4deprecated // import "0xacab.org/leap/obfs4deprecated/transports/obfs4"
 
 import (
 	"bytes"
@@ -42,12 +42,12 @@ import (
 	"syscall"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/drbg"
-	"0xacab.org/leap/obfs4-deprecated/common/ntor"
-	"0xacab.org/leap/obfs4-deprecated/common/probdist"
-	"0xacab.org/leap/obfs4-deprecated/common/replayfilter"
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
-	"0xacab.org/leap/obfs4-deprecated/transports/obfs4/framing"
+	"0xacab.org/leap/obfs4deprecated/common/drbg"
+	"0xacab.org/leap/obfs4deprecated/common/ntor"
+	"0xacab.org/leap/obfs4deprecated/common/probdist"
+	"0xacab.org/leap/obfs4deprecated/common/replayfilter"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/transports/obfs4deprecated/framing"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 )
 
diff --git a/transports/obfs4/packet.go b/transports/obfs4deprecated/packet.go
similarity index 97%
rename from transports/obfs4/packet.go
rename to transports/obfs4deprecated/packet.go
index 9205b49a5f8f35d19ddc15dfa1b445ec0992eca5..a0388fd082c9a547fc3ff8d1caf60fc70422927f 100644
--- a/transports/obfs4/packet.go
+++ b/transports/obfs4deprecated/packet.go
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package obfs4
+package obfs4deprecated
 
 import (
 	"crypto/sha256"
@@ -33,8 +33,8 @@ import (
 	"fmt"
 	"io"
 
-	"0xacab.org/leap/obfs4-deprecated/common/drbg"
-	"0xacab.org/leap/obfs4-deprecated/transports/obfs4/framing"
+	"0xacab.org/leap/obfs4deprecated/common/drbg"
+	"0xacab.org/leap/obfs4deprecated/transports/obfs4deprecated/framing"
 )
 
 const (
diff --git a/transports/obfs4/statefile.go b/transports/obfs4deprecated/statefile.go
similarity index 97%
rename from transports/obfs4/statefile.go
rename to transports/obfs4deprecated/statefile.go
index d44f52fa47a20f4f9d57255aed53f66d2803bc2a..a3a8bb17dced777e2d61ca17f7ce86b5881e08c9 100644
--- a/transports/obfs4/statefile.go
+++ b/transports/obfs4deprecated/statefile.go
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package obfs4
+package obfs4deprecated
 
 import (
 	"encoding/base64"
@@ -37,9 +37,9 @@ import (
 	"strconv"
 	"strings"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/common/drbg"
-	"0xacab.org/leap/obfs4-deprecated/common/ntor"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/drbg"
+	"0xacab.org/leap/obfs4deprecated/common/ntor"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 )
 
diff --git a/transports/scramblesuit/base.go b/transports/scramblesuit/base.go
index 3453297f2980a268b8b0636923e9fd2f42b24b55..5c5e9d5e7029fe0ddfb339e48fdd5975aa9c9d3f 100644
--- a/transports/scramblesuit/base.go
+++ b/transports/scramblesuit/base.go
@@ -27,13 +27,13 @@
 
 // Package scramblesuit provides an implementation of the ScrambleSuit
 // obfuscation protocol.  The implementation is client only.
-package scramblesuit // import "0xacab.org/leap/obfs4-deprecated/transports/scramblesuit"
+package scramblesuit // import "0xacab.org/leap/obfs4deprecated/transports/scramblesuit"
 
 import (
 	"fmt"
 	"net"
 
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 )
 
diff --git a/transports/scramblesuit/conn.go b/transports/scramblesuit/conn.go
index 4be4f79d22c9edad8fd12b38881945c777eff0a2..69f16923f938e280a65ea411c1ed744e8b07b527 100644
--- a/transports/scramblesuit/conn.go
+++ b/transports/scramblesuit/conn.go
@@ -42,10 +42,10 @@ import (
 	"net"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/common/drbg"
-	"0xacab.org/leap/obfs4-deprecated/common/probdist"
-	"0xacab.org/leap/obfs4-deprecated/common/uniformdh"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/drbg"
+	"0xacab.org/leap/obfs4deprecated/common/probdist"
+	"0xacab.org/leap/obfs4deprecated/common/uniformdh"
 	pt "git.torproject.org/pluggable-transports/goptlib.git"
 )
 
diff --git a/transports/scramblesuit/handshake_ticket.go b/transports/scramblesuit/handshake_ticket.go
index 2b86fd097505f5654837dcedf2b117382881d8fb..08d643e966313ebdeafb1b824b137f0db42644c2 100644
--- a/transports/scramblesuit/handshake_ticket.go
+++ b/transports/scramblesuit/handshake_ticket.go
@@ -42,7 +42,7 @@ import (
 	"sync"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
 )
 
 const (
diff --git a/transports/scramblesuit/handshake_uniformdh.go b/transports/scramblesuit/handshake_uniformdh.go
index 795de4a327ebe0d484acf298936c067603132513..5c07583f2fafcdafbb0fd6e2b816f276bd0f5943 100644
--- a/transports/scramblesuit/handshake_uniformdh.go
+++ b/transports/scramblesuit/handshake_uniformdh.go
@@ -36,8 +36,8 @@ import (
 	"strconv"
 	"time"
 
-	"0xacab.org/leap/obfs4-deprecated/common/csrand"
-	"0xacab.org/leap/obfs4-deprecated/common/uniformdh"
+	"0xacab.org/leap/obfs4deprecated/common/csrand"
+	"0xacab.org/leap/obfs4deprecated/common/uniformdh"
 )
 
 const (
diff --git a/transports/transports.go b/transports/transports.go
index 9f6fee8e2d95359aa346af0ca1c223983ea4e1d3..3d738ac27c28a98ffab1fa5b75e8c38282eef3ef 100644
--- a/transports/transports.go
+++ b/transports/transports.go
@@ -27,18 +27,18 @@
 
 // Package transports provides a interface to query supported pluggable
 // transports.
-package transports // import "0xacab.org/leap/obfs4-deprecated/transports"
+package transports // import "0xacab.org/leap/obfs4deprecated/transports"
 
 import (
 	"fmt"
 	"sync"
 
-	"0xacab.org/leap/obfs4-deprecated/transports/base"
-	"0xacab.org/leap/obfs4-deprecated/transports/meeklite"
-	"0xacab.org/leap/obfs4-deprecated/transports/obfs2"
-	"0xacab.org/leap/obfs4-deprecated/transports/obfs3"
-	"0xacab.org/leap/obfs4-deprecated/transports/obfs4"
-	"0xacab.org/leap/obfs4-deprecated/transports/scramblesuit"
+	"0xacab.org/leap/obfs4deprecated/transports/base"
+	"0xacab.org/leap/obfs4deprecated/transports/meeklite"
+	"0xacab.org/leap/obfs4deprecated/transports/obfs2"
+	"0xacab.org/leap/obfs4deprecated/transports/obfs3"
+	"0xacab.org/leap/obfs4deprecated/transports/scramblesuit"
+	"gitlab.com/yawning/obfs4.git/transports/obfs4"
 )
 
 var transportMapLock sync.Mutex