diff --git a/mtproto/consts.go b/mtproto/rpc/consts.go
similarity index 98%
rename from mtproto/consts.go
rename to mtproto/rpc/consts.go
index 1ce67e1..59512a3 100644
--- a/mtproto/consts.go
+++ b/mtproto/rpc/consts.go
@@ -1,4 +1,4 @@
-package mtproto
+package rpc
 
 // SeqNo* is the number of the sequence which have special meaning for
 // the Telegram.
diff --git a/mtproto/rpc/handshake_request.go b/mtproto/rpc/handshake_request.go
index 48b02f4..e0971cc 100644
--- a/mtproto/rpc/handshake_request.go
+++ b/mtproto/rpc/handshake_request.go
@@ -1,7 +1,5 @@
 package rpc
 
-import "github.com/9seconds/mtg/mtproto"
-
-var HandshakeRequest = append(mtproto.TagHandshake,
-	append(mtproto.HandshakeFlags,
-		append(mtproto.HandshakeSenderPID, mtproto.HandshakePeerPID...)...)...)
+var HandshakeRequest = append(TagHandshake,
+	append(HandshakeFlags,
+		append(HandshakeSenderPID, HandshakePeerPID...)...)...)
diff --git a/mtproto/rpc/handshake_response.go b/mtproto/rpc/handshake_response.go
index effe63f..659ce7c 100644
--- a/mtproto/rpc/handshake_response.go
+++ b/mtproto/rpc/handshake_response.go
@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-
-	"github.com/9seconds/mtg/mtproto"
 )
 
 type HandshakeResponse struct {
@@ -29,10 +27,10 @@ func (r *HandshakeResponse) Bytes() []byte {
 
 // Valid checks that handshake response compliments request.
 func (r *HandshakeResponse) Valid() error {
-	if !bytes.Equal(r.Type, mtproto.TagHandshake) {
+	if !bytes.Equal(r.Type, TagHandshake) {
 		return errors.New("Unexpected handshake tag")
 	}
-	if !bytes.Equal(r.PeerPID, mtproto.HandshakeSenderPID) {
+	if !bytes.Equal(r.PeerPID, HandshakeSenderPID) {
 		return errors.New("Incorrect sender PID")
 	}
 
diff --git a/mtproto/rpc/nonce_request.go b/mtproto/rpc/nonce_request.go
index 6d3b976..2915dad 100644
--- a/mtproto/rpc/nonce_request.go
+++ b/mtproto/rpc/nonce_request.go
@@ -6,8 +6,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"time"
-
-	"github.com/9seconds/mtg/mtproto"
 )
 
 type NonceRequest struct {
@@ -20,11 +18,11 @@ type NonceRequest struct {
 func (r *NonceRequest) Bytes() []byte {
 	buf := &bytes.Buffer{}
 
-	buf.Write(mtproto.TagNonce)       // nolint: gosec
-	buf.Write(r.KeySelector)          // nolint: gosec
-	buf.Write(mtproto.NonceCryptoAES) // nolint: gosec
-	buf.Write(r.CryptoTS)             // nolint: gosec
-	buf.Write(r.Nonce)                // nolint: gosec
+	buf.Write(TagNonce)
+	buf.Write(r.KeySelector)
+	buf.Write(NonceCryptoAES)
+	buf.Write(r.CryptoTS)
+	buf.Write(r.Nonce)
 
 	return buf.Bytes()
 }
diff --git a/mtproto/rpc/nonce_response.go b/mtproto/rpc/nonce_response.go
index 5e78be5..08b9a4b 100644
--- a/mtproto/rpc/nonce_response.go
+++ b/mtproto/rpc/nonce_response.go
@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-
-	"github.com/9seconds/mtg/mtproto"
 )
 
 type NonceResponse struct {
@@ -29,10 +27,10 @@ func (r *NonceResponse) Bytes() []byte {
 }
 
 func (r *NonceResponse) Valid(req *NonceRequest) error {
-	if !bytes.Equal(r.Type, mtproto.TagNonce) {
+	if !bytes.Equal(r.Type, TagNonce) {
 		return errors.New("Unexpected RPC type")
 	}
-	if !bytes.Equal(r.Crypto, mtproto.NonceCryptoAES) {
+	if !bytes.Equal(r.Crypto, NonceCryptoAES) {
 		return errors.New("Unexpected crypto type")
 	}
 	if !bytes.Equal(r.KeySelector, req.KeySelector) {