diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d1076f..286a9de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,12 @@ include(GNUInstallDirs)
 set (PROGRAM_EXE ${CMAKE_PROJECT_NAME})
 
 set (PROGRAM_SOURCE
-	src/console.cpp
 	src/core/file.cpp
 	src/core/dictionary.cpp
-	src/string.cpp
-	src/base58.cpp
-	src/WIF.cpp
+	src/core/string.cpp
+	src/crypto/base58.cpp
+	src/crypto/WIF.cpp
+	src/console.cpp
 	src/key_search.cpp
 	src/key_search_helpers.cpp
 	src/benchmark.cpp
diff --git a/src/core/dictionary.cpp b/src/core/dictionary.cpp
index 69c9272..8cf9e21 100644
--- a/src/core/dictionary.cpp
+++ b/src/core/dictionary.cpp
@@ -3,7 +3,7 @@
 #include <cstdio>
 #include <iterator>
 #include <algorithm>
-#include "../string.h"
+#include "string.h"
 #include "dictionary.h"
 
 namespace eoskeygen {
diff --git a/src/core/file.h b/src/core/file.h
index 19ce2ae..72cb5ab 100644
--- a/src/core/file.h
+++ b/src/core/file.h
@@ -24,7 +24,7 @@
 #ifndef EOSIOKEYGEN_CORE_FILE_H
 #define EOSIOKEYGEN_CORE_FILE_H
 
-#include "../string.h"
+#include "string.h"
 #include <vector>
 
 namespace eoskeygen {
diff --git a/src/string.cpp b/src/core/string.cpp
similarity index 100%
rename from src/string.cpp
rename to src/core/string.cpp
diff --git a/src/string.h b/src/core/string.h
similarity index 100%
rename from src/string.h
rename to src/core/string.h
diff --git a/src/WIF.cpp b/src/crypto/WIF.cpp
similarity index 100%
rename from src/WIF.cpp
rename to src/crypto/WIF.cpp
diff --git a/src/WIF.h b/src/crypto/WIF.h
similarity index 91%
rename from src/WIF.h
rename to src/crypto/WIF.h
index a8bba10..14a1855 100644
--- a/src/WIF.h
+++ b/src/crypto/WIF.h
@@ -21,11 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef EOSIOKEYGEN_WIF_H
-#define EOSIOKEYGEN_WIF_H
+#ifndef EOSIOKEYGEN_CRYPTO_WIF_H
+#define EOSIOKEYGEN_CRYPTO_WIF_H
 
 #include <string>
-#include "crypto/types.h"
+#include "types.h"
 
 namespace eoskeygen {
 
@@ -37,4 +37,4 @@ void wif_print_key(const struct ec_keypair *key);
 
 } // namespace eoskeygen
 
-#endif /* EOSIOKEYGEN_WIF_H */
+#endif /* EOSIOKEYGEN_CRYPTO_WIF_H */
diff --git a/src/base58.cpp b/src/crypto/base58.cpp
similarity index 100%
rename from src/base58.cpp
rename to src/crypto/base58.cpp
diff --git a/src/base58.h b/src/crypto/base58.h
similarity index 92%
rename from src/base58.h
rename to src/crypto/base58.h
index 16b7798..656969e 100644
--- a/src/base58.h
+++ b/src/crypto/base58.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef EOSIOKEYGEN_BASE58_H
-#define EOSIOKEYGEN_BASE58_H
+#ifndef EOSIOKEYGEN_CRYPTO_BASE58_H
+#define EOSIOKEYGEN_CRYPTO_BASE58_H
 
 #include <string>
 #include <vector>
@@ -35,4 +35,4 @@ std::string base58_encode(const unsigned char* pbegin, const unsigned char* pend
 
 } //namespace eoskeygen
 
-#endif /* EOSIOKEYGEN_BASE58_H */
+#endif /* EOSIOKEYGEN_CRYPTO_BASE58_H */
diff --git a/src/checksum.h b/src/crypto/checksum.h
similarity index 94%
rename from src/checksum.h
rename to src/crypto/checksum.h
index a67a42b..a5f48f8 100644
--- a/src/checksum.h
+++ b/src/crypto/checksum.h
@@ -21,13 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef EOSIOKEYGEN_CHECKSUM_H
-#define EOSIOKEYGEN_CHECKSUM_H
+#ifndef EOSIOKEYGEN_CRYPTO_EOS_CHECKSUM_H
+#define EOSIOKEYGEN_CRYPTO_EOS_CHECKSUM_H
 
 #include <cstddef>
 #include <cstring>
 #include <array>
-#include "crypto/hash.h"
+#include "hash.h"
 
 namespace eoskeygen {
 
diff --git a/src/key_search_helpers.cpp b/src/key_search_helpers.cpp
index cada86d..661b6e0 100644
--- a/src/key_search_helpers.cpp
+++ b/src/key_search_helpers.cpp
@@ -23,7 +23,7 @@
  */
 #include <iostream>
 #include "core/dictionary.h"
-#include "WIF.h"
+#include "crypto/WIF.h"
 #include "console.h"
 #include "key_search_helpers.h"
 
diff --git a/src/key_search_helpers.h b/src/key_search_helpers.h
index 443257f..9b2862c 100644
--- a/src/key_search_helpers.h
+++ b/src/key_search_helpers.h
@@ -24,7 +24,7 @@
 #ifndef EOSIOKEYGEN_KEY_SEARCH_HELPERS_H
 #define EOSIOKEYGEN_KEY_SEARCH_HELPERS_H
 
-#include "string.h"
+#include "core/string.h"
 #include "crypto/types.h"
 
 namespace eoskeygen {
diff --git a/src/main.cpp b/src/main.cpp
index bd47fc7..58e1449 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -26,13 +26,13 @@
 #endif /* HAVE_THREADS */
 #include <iostream>
 #include <cstring>
-#include "console.h"
 #include "config.h"
 #include "core/file.h"
 #include "core/dictionary.h"
-#include "string.h"
-#include "WIF.h"
+#include "core/string.h"
 #include "crypto/ec.h"
+#include "crypto/WIF.h"
+#include "console.h"
 #include "key_search.h"
 #include "benchmark.h"