diff --git a/main.cpp b/main.cpp
index da9686dd..f9217e00 100644
--- a/main.cpp
+++ b/main.cpp
@@ -50,7 +50,7 @@
 #include "model/TransactionHistorySortFilterModel.h"
 #include "AddressBook.h"
 #include "model/AddressBookModel.h"
-#include "wallet/wallet2_api.h"
+#include "wallet/api/wallet2_api.h"
 #include "MainApp.h"
 
 // IOS exclusions
diff --git a/monero b/monero
index ab594cfe..8512a835 160000
--- a/monero
+++ b/monero
@@ -1 +1 @@
-Subproject commit ab594cfee94dff87bb7039724563f6177a892b8b
+Subproject commit 8512a83572094f96aff95e02db359914a37c3c71
diff --git a/src/libwalletqt/AddressBook.h b/src/libwalletqt/AddressBook.h
index 3738f0e9..b7ebc1d8 100644
--- a/src/libwalletqt/AddressBook.h
+++ b/src/libwalletqt/AddressBook.h
@@ -1,7 +1,7 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 #include <QObject>
 #include <QList>
 #include <QDateTime>
diff --git a/src/libwalletqt/PendingTransaction.h b/src/libwalletqt/PendingTransaction.h
index a20264e6..5aa94e0b 100644
--- a/src/libwalletqt/PendingTransaction.h
+++ b/src/libwalletqt/PendingTransaction.h
@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 
 //namespace Monero {
 //class PendingTransaction;
diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp
index eeb5c2a6..40b3d3c4 100644
--- a/src/libwalletqt/TransactionHistory.cpp
+++ b/src/libwalletqt/TransactionHistory.cpp
@@ -1,6 +1,6 @@
 #include "TransactionHistory.h"
 #include "TransactionInfo.h"
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 
 #include <QDebug>
 
diff --git a/src/libwalletqt/TransactionInfo.h b/src/libwalletqt/TransactionInfo.h
index fa13a3be..d957c455 100644
--- a/src/libwalletqt/TransactionInfo.h
+++ b/src/libwalletqt/TransactionInfo.h
@@ -1,7 +1,7 @@
 #ifndef TRANSACTIONINFO_H
 #define TRANSACTIONINFO_H
 
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 #include <QObject>
 #include <QDateTime>
 
diff --git a/src/libwalletqt/Transfer.h b/src/libwalletqt/Transfer.h
index a31ad84e..55974a74 100644
--- a/src/libwalletqt/Transfer.h
+++ b/src/libwalletqt/Transfer.h
@@ -1,7 +1,7 @@
 #ifndef TRANSFER_H
 #define TRANSFER_H
 
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 #include <QObject>
 
 class Transfer : public QObject
diff --git a/src/libwalletqt/UnsignedTransaction.h b/src/libwalletqt/UnsignedTransaction.h
index 749445a2..6c5a13ec 100644
--- a/src/libwalletqt/UnsignedTransaction.h
+++ b/src/libwalletqt/UnsignedTransaction.h
@@ -3,7 +3,7 @@
 
 #include <QObject>
 
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 
 class UnsignedTransaction : public QObject
 {
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index da7ecd9b..2475a654 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -6,7 +6,7 @@
 #include "model/TransactionHistoryModel.h"
 #include "model/TransactionHistorySortFilterModel.h"
 #include "model/AddressBookModel.h"
-#include "wallet/wallet2_api.h"
+#include "wallet/api/wallet2_api.h"
 
 #include <QFile>
 #include <QDir>
diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h
index c653b8df..8bb184c9 100644
--- a/src/libwalletqt/Wallet.h
+++ b/src/libwalletqt/Wallet.h
@@ -6,7 +6,7 @@
 #include <QMutex>
 #include <QtConcurrent/QtConcurrent>
 
-#include "wallet/wallet2_api.h" // we need to have an access to the Monero::Wallet::Status enum here;
+#include "wallet/api/wallet2_api.h" // we need to have an access to the Monero::Wallet::Status enum here;
 #include "PendingTransaction.h" // we need to have an access to the PendingTransaction::Priority enum here;
 #include "UnsignedTransaction.h"
 
diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index 3d9501ce..875e4cca 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -1,6 +1,6 @@
 #include "WalletManager.h"
 #include "Wallet.h"
-#include "wallet/wallet2_api.h"
+#include "wallet/api/wallet2_api.h"
 #include "zxcvbn-c/zxcvbn.h"
 #include "QRCodeImageProvider.h"
 #include <QFile>
diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h
index 4598e07a..7eacc3f0 100644
--- a/src/libwalletqt/WalletManager.h
+++ b/src/libwalletqt/WalletManager.h
@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <QUrl>
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 #include <QMutex>
 #include <QPointer>
 
diff --git a/src/model/AddressBookModel.cpp b/src/model/AddressBookModel.cpp
index c022ce98..74b2caf2 100644
--- a/src/model/AddressBookModel.cpp
+++ b/src/model/AddressBookModel.cpp
@@ -2,7 +2,7 @@
 #include "AddressBook.h"
 #include <QDebug>
 #include <QHash>
-#include <wallet/wallet2_api.h>
+#include <wallet/api/wallet2_api.h>
 
 AddressBookModel::AddressBookModel(QObject *parent, AddressBook *addressBook)
     : QAbstractListModel(parent) , m_addressBook(addressBook)