8 files changed, 10 insertions, 37 deletions
diff --git a/src/server/shared/Cryptography/ARC4.cpp b/src/server/shared/Cryptography/ARC4.cpp
index 80cad4991e9..8427640ba2a 100644
--- a/src/server/shared/Cryptography/ARC4.cpp
+++ b/src/server/shared/Cryptography/ARC4.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Auth/SARC4.h"
+#include "ARC4.h"
 #include <openssl/sha.h>
 
 SARC4::SARC4(uint8 len)
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
index b34b922b16a..2dfcebfa932 100644
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
@@ -19,9 +19,9 @@
  */
 
 #include "AuthCrypt.h"
-#include "Hmac.h"
-#include "Log.h"
-#include "BigNumber.h"
+#include "Cryptography/HMACSHA1.h"
+#include "Logging/Log.h"
+#include "Cryptography/BigNumber.h"
 
 AuthCrypt::AuthCrypt() : _clientDecrypt(SHA_DIGEST_LENGTH), _serverEncrypt(SHA_DIGEST_LENGTH)
 {
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.h b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
index 6695dc580cc..5a2430611a4 100644
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.h
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.h
@@ -22,7 +22,7 @@
 #define _AUTHCRYPT_H
 
 #include <Common.h>
-#include "SARC4.h"
+#include "Cryptography/ARC4.h"
 
 class BigNumber;
 
diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index 64e9ef21ccc..c05258c73a0 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/BigNumber.h"
+#include "Cryptography/BigNumber.h"
 #include <openssl/bn.h>
 #include <algorithm>
 
diff --git a/src/server/shared/Cryptography/CMakeLists.txt b/src/server/shared/Cryptography/CMakeLists.txt
deleted file mode 100644
index 6e5d10d40e5..00000000000
--- a/src/server/shared/Cryptography/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-
-########### next target ###############
-
-SET(trinityauth_STAT_SRCS
-   AuthCrypt.cpp
-   AuthCrypt.h
-   BigNumber.cpp
-   BigNumber.h
-   Hmac.cpp
-   Hmac.h
-   Sha1.cpp
-   Sha1.h
-   md5.c
-   md5.h
-   SARC4.cpp
-   SARC4.h
-)
-
-include_directories(
-  ${ACE_INCLUDE_DIR}
-  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/src/server/framework
-  ${MYSQL_INCLUDE_DIR}
-)
-
-add_library(trinityauth STATIC ${trinityauth_STAT_SRCS})
diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp
index a30f1b2d1e2..aed8940372b 100644
--- a/src/server/shared/Cryptography/HMACSHA1.cpp
+++ b/src/server/shared/Cryptography/HMACSHA1.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/Hmac.h"
+#include "HMACSHA1.h"
 #include "BigNumber.h"
 
 HmacHash::HmacHash(uint32 len, uint8 *seed)
diff --git a/src/server/shared/Cryptography/MD5.c b/src/server/shared/Cryptography/MD5.c
index 3e9735e2dbb..45897503455 100644
--- a/src/server/shared/Cryptography/MD5.c
+++ b/src/server/shared/Cryptography/MD5.c
@@ -51,7 +51,7 @@ self-checking.
 1999-05-03 lpd Original version.
 */
 
-#include "md5.h"
+#include "MD5.h"
 #include <string.h>
 
 #undef BYTE_ORDER                                           /* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp
index b63deb2c5f3..b50f72af4d3 100644
--- a/src/server/shared/Cryptography/SHA1.cpp
+++ b/src/server/shared/Cryptography/SHA1.cpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Auth/Sha1.h"
-#include "Auth/BigNumber.h"
+#include "SHA1.h"
+#include "BigNumber.h"
 #include <stdarg.h>
 
 Sha1Hash::Sha1Hash()