diff --git a/src/packet/ERRORPacket.cpp b/src/packet/ERRORPacket.cpp
@@ -1,6 +1,7 @@
 #include "../../include/Packet/ERRORPacket.h"
+#include "../../include/MessageEncoderDecoder.h"
 
-    ERRORPacket::ERRORPacket(short errorCode, const string &errMsg) :
+ERRORPacket::ERRORPacket(short errorCode, const string &errMsg) :
 errorCode(errorCode),errMsg(errMsg)
 {
         Packet::opCode = 5;
@@ -12,7 +13,7 @@ errorCode(errorCode),errMsg(errMsg)
 
 const char* ERRORPacket::getErrorCodeInBytes() {
     char *errorCodeArr = new char[2];
-    shortToBytes(getErrorCode(),errorCodeArr);
+    MessageEncoderDecoder::shortToBytes(getErrorCode(),errorCodeArr);
     return errorCodeArr;
 }
 
@@ -27,8 +28,8 @@ const char* ERRORPacket::getErrorCodeInBytes() {
         const char *errorMsgChar = errMsg.c_str();
         char *returnBytes = new char[2 + 2+ errMsg.length() + 1];
 
-        shortToBytes(opCode, opCodeBytes);
-        shortToBytes(errorCode, errorCodeChar);
+        MessageEncoderDecoder::shortToBytes(opCode, opCodeBytes);
+        MessageEncoderDecoder::shortToBytes(errorCode, errorCodeChar);
 
         for (unsigned int i = 0; i < 2; i++)
             returnBytes[i] = opCodeBytes[i];

diff --git a/src/packet/LOGRQPacket.cpp b/src/packet/LOGRQPacket.cpp
@@ -1,4 +1,5 @@
 #include "../../include/Packet/LOGRQPacket.h"
+#include "../../include/MessageEncoderDecoder.h"
 
 LOGRQPacket::LOGRQPacket(const std::string &userName):userName(userName){
     opCode=7;
@@ -14,7 +15,7 @@ char * LOGRQPacket::toByteArr()  {
     const char *userNameChar = userName.c_str();
     char *returnBytes = new char[2 + userName.length() + 1];
 
-    shortToBytes(opCode, opCodeBytes);
+    MessageEncoderDecoder::shortToBytes(opCode, opCodeBytes);
 
     for (unsigned int i = 0; i < 2; i++)
         returnBytes[i] = opCodeBytes[i];

diff --git a/src/packet/Packet.cpp b/src/packet/Packet.cpp
@@ -1,18 +1,13 @@
 #include "../../include/Packet/Packet.h"
+#include "../../include/MessageEncoderDecoder.h"
 
-    short Packet::getOpCode() {
+short Packet::getOpCode() {
         return opCode;
     }
 
-void Packet::shortToBytes(short num, char *bytesArr) {
-
-    bytesArr[0] = ((num >> 8) & 0xFF);
-    bytesArr[1] = (num & 0xFF);
-}
-
 const char* Packet::getOpCodeInBytes() {
     char *opCodeArr = new char[2];
-    shortToBytes(getOpCode(),opCodeArr);
+    MessageEncoderDecoder::shortToBytes(getOpCode(),opCodeArr);
     return opCodeArr;
 }
 
diff --git a/src/packet/RRQPacket.cpp b/src/packet/RRQPacket.cpp
@@ -1,6 +1,7 @@
 #include "../../include/Packet/RRQPacket.h"
+#include "../../include/MessageEncoderDecoder.h"
 
-    RRQPacket::RRQPacket(const string &filename):fileName(filename) {
+RRQPacket::RRQPacket(const string &filename):fileName(filename) {
         opCode=1;
     }
 
@@ -13,7 +14,7 @@
         const char *fileNameChar = fileName.c_str();
         char *returnBytes = new char[2 + fileName.length() + 1];
 
-        shortToBytes(opCode, opCodeBytes);
+        MessageEncoderDecoder::shortToBytes(opCode, opCodeBytes);
 
         for (unsigned int i = 0; i < 2; i++)
             returnBytes[i] = opCodeBytes[i];

diff --git a/src/packet/WRQPacket.cpp b/src/packet/WRQPacket.cpp
@@ -1,6 +1,7 @@
 #include "../../include/Packet/WRQPacket.h"
+#include "../../include/MessageEncoderDecoder.h"
 
-    WRQPacket::WRQPacket(const string &filename) :fileName(filename){
+WRQPacket::WRQPacket(const string &filename) :fileName(filename){
         Packet::opCode = 2;
     }
 
@@ -13,7 +14,7 @@
         const char *fileNameChar = fileName.c_str();
         char *returnBytes = new char[2 + fileName.length() + 1];
 
-        shortToBytes(opCode, opCodeBytes);
+        MessageEncoderDecoder::shortToBytes(opCode, opCodeBytes);
 
         for (unsigned int i = 0; i < 2; i++)
             returnBytes[i] = opCodeBytes[i];