diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9673e36e..572515b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,6 +41,7 @@ file(GLOB_RECURSE SIMPLEWALLET simplewallet/*)
 file(GLOB_RECURSE CONN_TOOL connectivity_tool/*)
 file(GLOB_RECURSE WALLET wallet/*)
 file(GLOB_RECURSE MINER miner/*)
+file(GLOB_RECURSE MNEMONICS mnemonics/*)
 
 source_group(common FILES ${COMMON})
 source_group(crypto FILES ${CRYPTO})
@@ -53,10 +54,12 @@ source_group(simplewallet FILES ${SIMPLEWALLET})
 source_group(connectivity-tool FILES ${CONN_TOOL})
 source_group(wallet FILES ${WALLET})
 source_group(simpleminer FILES ${MINER})
+source_group(mnemonics FILES ${MNEMONICS})
 
 add_library(common ${COMMON})
 add_library(crypto ${CRYPTO})
 add_library(cryptonote_core ${CRYPTONOTE_CORE})
+add_library(mnemonics ${MNEMONICS})
 add_executable(daemon ${DAEMON} ${P2P} ${CRYPTONOTE_PROTOCOL})
 add_executable(connectivity_tool ${CONN_TOOL})
 add_executable(simpleminer ${MINER})
@@ -65,8 +68,9 @@ target_link_libraries(connectivity_tool cryptonote_core crypto common ${CMAKE_TH
 target_link_libraries(simpleminer cryptonote_core crypto common ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 add_library(rpc ${RPC})
 add_library(wallet ${WALLET})
+target_link_libraries(wallet mnemonics)
 add_executable(simplewallet ${SIMPLEWALLET} )
-target_link_libraries(simplewallet wallet rpc cryptonote_core crypto common ${UPNP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
+target_link_libraries(simplewallet wallet rpc cryptonote_core crypto common mnemonics ${UPNP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${Boost_LIBRARIES})
 add_dependencies(daemon version)
 add_dependencies(rpc version)
 add_dependencies(simplewallet version)
diff --git a/src/crypto/electrum-words.cpp b/src/mnemonics/electrum-words.cpp
similarity index 99%
rename from src/crypto/electrum-words.cpp
rename to src/mnemonics/electrum-words.cpp
index add71808..4f672ec5 100644
--- a/src/crypto/electrum-words.cpp
+++ b/src/mnemonics/electrum-words.cpp
@@ -40,7 +40,7 @@
 #include <boost/algorithm/string.hpp>
 #include "crypto/crypto.h"  // for declaration of crypto::secret_key
 
-#include "crypto/electrum-words.h"
+#include "mnemonics/electrum-words.h"
 
 namespace crypto
 {
diff --git a/src/crypto/electrum-words.h b/src/mnemonics/electrum-words.h
similarity index 100%
rename from src/crypto/electrum-words.h
rename to src/mnemonics/electrum-words.h
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index fbe7c473..e71655e4 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -45,7 +45,7 @@
 #include "wallet/wallet_rpc_server.h"
 #include "version.h"
 #include "crypto/crypto.h"  // for crypto::secret_key definition
-#include "crypto/electrum-words.h"
+#include "mnemonics/electrum-words.h"
 
 #if defined(WIN32)
 #include <crtdbg.h>
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 9ba6f245..6222b0c0 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -46,7 +46,7 @@ using namespace epee;
 #include "crypto/crypto.h"
 #include "serialization/binary_utils.h"
 #include "cryptonote_protocol/blobdatatype.h"
-#include "crypto/electrum-words.h"
+#include "mnemonics/electrum-words.h"
 
 extern "C"
 {