diff --git a/main.cpp b/main.cpp
index 0e996b84..b486c5f0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -44,7 +44,8 @@ int main(int argc, char *argv[])
     app.installEventFilter(eventFilter);
 
     qmlRegisterType<clipboardAdapter>("moneroComponents", 1, 0, "Clipboard");
-    qmlRegisterType<Wallet>("moneroWallet", 1, 0, "Wallet");
+    //qmlRegisterType<Wallet>("moneroWallet", 1, 0, "Wallet");
+    qmlRegisterType<Wallet>();
 
     QQmlApplicationEngine engine;
 
diff --git a/monero-core.pro b/monero-core.pro
index 4b071fb1..7b05829f 100644
--- a/monero-core.pro
+++ b/monero-core.pro
@@ -6,23 +6,24 @@ WALLET_ROOT=$$PWD/bitmonero
 
 CONFIG += c++11
 
-INCLUDEPATH += $$WALLET_ROOT/include
+INCLUDEPATH += $$WALLET_ROOT/include \
+                $$PWD/src/libwalletqt
 
 
 HEADERS += \
     filter.h \
     clipboardAdapter.h \
     oscursor.h \
-    WalletManager.h \
-    Wallet.h
+    src/libwalletqt/WalletManager.h \
+    src/libwalletqt/Wallet.h
 
 
 SOURCES += main.cpp \
     filter.cpp \
     clipboardAdapter.cpp \
     oscursor.cpp \
-    WalletManager.cpp \
-    Wallet.cpp
+    src/libwalletqt/WalletManager.cpp \
+    src/libwalletqt/Wallet.cpp
 
 lupdate_only {
 SOURCES = *.qml \
diff --git a/Wallet.cpp b/src/libwalletqt/Wallet.cpp
similarity index 100%
rename from Wallet.cpp
rename to src/libwalletqt/Wallet.cpp
diff --git a/Wallet.h b/src/libwalletqt/Wallet.h
similarity index 100%
rename from Wallet.h
rename to src/libwalletqt/Wallet.h
diff --git a/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
similarity index 100%
rename from WalletManager.cpp
rename to src/libwalletqt/WalletManager.cpp
diff --git a/WalletManager.h b/src/libwalletqt/WalletManager.h
similarity index 100%
rename from WalletManager.h
rename to src/libwalletqt/WalletManager.h