diff --git a/private/qtjolie-branch/CMakeLists.txt b/private/qtjolie-branch/CMakeLists.txt
deleted file mode 100644
index 0f276dcbc..000000000
--- a/private/qtjolie-branch/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory(qtjolie)
-add_subdirectory(includes)
-#add_subdirectory(tests)
diff --git a/private/qtjolie-branch/qtjolie/qtjolie.diff b/private/qtjolie-branch/qtjolie/qtjolie.diff
deleted file mode 100644
index db249f117..000000000
--- a/private/qtjolie-branch/qtjolie/qtjolie.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: server.cpp
-===================================================================
---- server.cpp	(revision 985276)
-+++ server.cpp	(working copy)
-@@ -22,6 +22,7 @@
- #include "server_p.h"
- 
- #include <QtCore/QDebug>
-+#include <QtCore/QString>
- 
- #include "abstractadaptor.h"
- #include "serverthread_p.h"
-@@ -56,11 +57,13 @@
- 
- bool Server::registerAdaptor(const QByteArray &path, AbstractAdaptor *adaptor)
- {
-+    //qDebug() << "registering an adaptor: " << QString(path);
-     if (path.isEmpty() || d->adaptors.contains(path)) {
-         return false;
-     }
- 
-     d->adaptors[path] = adaptor;
-+    return true;
- }
- 
- bool Server::unregisterAdaptor(const QByteArray &path)
-@@ -68,11 +71,16 @@
-     return d->adaptors.take(path)!=0;
- }
- 
-+void Server::sendMessage(int descriptor, const Message &message)
-+{
-+    d->serverThread->sendMessage(descriptor, message);
-+}
-+
- void ServerPrivate::messageReceived(int descriptor, const Message &message)
- {
-     if (adaptors.contains(message.resourcePath())) {
--        Message reply = adaptors[message.resourcePath()]->relay(q, message);
--        serverThread->sendMessage(descriptor, reply);
-+        adaptors[message.resourcePath()]->relay(q, descriptor, message);
-+        //serverThread->sendMessage(descriptor, reply);
-     } else {
-         qWarning() << "Got a message for an unregistered object:"
-                    << message.operationName()
-Index: sodephelpers_p.h
-===================================================================
---- sodephelpers_p.h	(revision 985276)
-+++ sodephelpers_p.h	(working copy)
-@@ -193,7 +193,7 @@
-     io.read(data, length);
-     data[length] = '\0';
- 
--    QByteArray result(data);
-+    QByteArray result(data, length);
-     delete[] data;
- 
-     return result;
-Index: abstractadaptor.h
-===================================================================
---- abstractadaptor.h	(revision 985276)
-+++ abstractadaptor.h	(working copy)
-@@ -40,7 +40,7 @@
- 
- 
- private:
--    virtual Message relay(Server *server, const Message &message) = 0;
-+    virtual void relay(Server *server, int descriptor, const Message &message) = 0;
- 
-     friend class ServerPrivate;
- 
-Index: QtJolie.prf.cmake
-===================================================================
---- QtJolie.prf.cmake	(revision 985276)
-+++ QtJolie.prf.cmake	(working copy)
-@@ -5,9 +5,9 @@
- INCLUDEPATH += $$QTJOLIE_INCDIR
- LIBS += -L$$QTJOLIE_LIBDIR
- 
--LINKAGE = -llibQtJolie
-+LINKAGE = -lQtJolie
- CONFIG(debug, debug|release) {
--	windows:LINKAGE = -llibQtJolied
--	mac:LINKAGE = -llibQtJolie_debug
-+	windows:LINKAGE = -lQtJolied
-+	mac:LINKAGE = -lQtJolie_debug
- }
- LIBS += $$LINKAGE
-Index: QtJolie.pc.cmake
-===================================================================
---- QtJolie.pc.cmake	(revision 985276)
-+++ QtJolie.pc.cmake	(working copy)
-@@ -7,5 +7,5 @@
- Description: A QtDbus like API for JOLIE
- Version: 1.0.0
- Requires: QtCore
--Libs: -L${libdir} -llibQtJolie
-+Libs: -L${libdir} -lQtJolie
- Cflags: -I${includedir}
-Index: server.h
-===================================================================
---- server.h	(revision 985276)
-+++ server.h	(working copy)
-@@ -47,6 +47,7 @@
- 
-     bool registerAdaptor(const QByteArray &path, AbstractAdaptor *adaptor);
-     bool unregisterAdaptor(const QByteArray &path);
-+    void sendMessage(int descriptor, const Message &message);
- 
- private:
-     friend class ServerPrivate;
diff --git a/private/qtjolie/CMakeLists.txt b/private/qtjolie/CMakeLists.txt
new file mode 100644
index 000000000..ae270c9b8
--- /dev/null
+++ b/private/qtjolie/CMakeLists.txt
@@ -0,0 +1,10 @@
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+
+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
+
+add_subdirectory(qtjolie)
+add_subdirectory(includes)
+add_subdirectory(tests)
diff --git a/private/qtjolie-branch/Mainpage.dox b/private/qtjolie/Mainpage.dox
similarity index 100%
rename from private/qtjolie-branch/Mainpage.dox
rename to private/qtjolie/Mainpage.dox
diff --git a/private/qtjolie-branch/includes/CMakeLists.txt b/private/qtjolie/includes/CMakeLists.txt
similarity index 100%
rename from private/qtjolie-branch/includes/CMakeLists.txt
rename to private/qtjolie/includes/CMakeLists.txt
diff --git a/private/qtjolie-branch/includes/QtJolie/AbstractAdaptor b/private/qtjolie/includes/QtJolie/AbstractAdaptor
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/AbstractAdaptor
rename to private/qtjolie/includes/QtJolie/AbstractAdaptor
diff --git a/private/qtjolie-branch/includes/QtJolie/Client b/private/qtjolie/includes/QtJolie/Client
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/Client
rename to private/qtjolie/includes/QtJolie/Client
diff --git a/private/qtjolie-branch/includes/QtJolie/Fault b/private/qtjolie/includes/QtJolie/Fault
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/Fault
rename to private/qtjolie/includes/QtJolie/Fault
diff --git a/private/qtjolie-branch/includes/QtJolie/Message b/private/qtjolie/includes/QtJolie/Message
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/Message
rename to private/qtjolie/includes/QtJolie/Message
diff --git a/private/qtjolie-branch/includes/QtJolie/MetaService b/private/qtjolie/includes/QtJolie/MetaService
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/MetaService
rename to private/qtjolie/includes/QtJolie/MetaService
diff --git a/private/qtjolie-branch/includes/QtJolie/PendingCall b/private/qtjolie/includes/QtJolie/PendingCall
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/PendingCall
rename to private/qtjolie/includes/QtJolie/PendingCall
diff --git a/private/qtjolie-branch/includes/QtJolie/PendingCallWatcher b/private/qtjolie/includes/QtJolie/PendingCallWatcher
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/PendingCallWatcher
rename to private/qtjolie/includes/QtJolie/PendingCallWatcher
diff --git a/private/qtjolie-branch/includes/QtJolie/PendingReply b/private/qtjolie/includes/QtJolie/PendingReply
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/PendingReply
rename to private/qtjolie/includes/QtJolie/PendingReply
diff --git a/private/qtjolie-branch/includes/QtJolie/Server b/private/qtjolie/includes/QtJolie/Server
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/Server
rename to private/qtjolie/includes/QtJolie/Server
diff --git a/private/qtjolie-branch/includes/QtJolie/Value b/private/qtjolie/includes/QtJolie/Value
similarity index 100%
rename from private/qtjolie-branch/includes/QtJolie/Value
rename to private/qtjolie/includes/QtJolie/Value
diff --git a/private/qtjolie-branch/qtjolie/CMakeLists.txt b/private/qtjolie/qtjolie/CMakeLists.txt
similarity index 100%
rename from private/qtjolie-branch/qtjolie/CMakeLists.txt
rename to private/qtjolie/qtjolie/CMakeLists.txt
diff --git a/private/qtjolie-branch/qtjolie/QtJolie.pc.cmake b/private/qtjolie/qtjolie/QtJolie.pc.cmake
similarity index 88%
rename from private/qtjolie-branch/qtjolie/QtJolie.pc.cmake
rename to private/qtjolie/qtjolie/QtJolie.pc.cmake
index 5d40665cc..1995ed3b0 100644
--- a/private/qtjolie-branch/qtjolie/QtJolie.pc.cmake
+++ b/private/qtjolie/qtjolie/QtJolie.pc.cmake
@@ -7,5 +7,5 @@ Name: QtJolie
 Description: A QtDbus like API for JOLIE
 Version: 1.0.0
 Requires: QtCore
-Libs: -L${libdir} -lQtJolie
+Libs: -L${libdir} -llibQtJolie
 Cflags: -I${includedir}
diff --git a/private/qtjolie-branch/qtjolie/QtJolie.prf.cmake b/private/qtjolie/qtjolie/QtJolie.prf.cmake
similarity index 68%
rename from private/qtjolie-branch/qtjolie/QtJolie.prf.cmake
rename to private/qtjolie/qtjolie/QtJolie.prf.cmake
index 48c6066eb..333c50a85 100644
--- a/private/qtjolie-branch/qtjolie/QtJolie.prf.cmake
+++ b/private/qtjolie/qtjolie/QtJolie.prf.cmake
@@ -5,9 +5,9 @@ CONFIG *= qt
 INCLUDEPATH += $$QTJOLIE_INCDIR
 LIBS += -L$$QTJOLIE_LIBDIR
 
-LINKAGE = -lQtJolie
+LINKAGE = -llibQtJolie
 CONFIG(debug, debug|release) {
-	windows:LINKAGE = -lQtJolied
-	mac:LINKAGE = -lQtJolie_debug
+	windows:LINKAGE = -llibQtJolied
+	mac:LINKAGE = -llibQtJolie_debug
 }
 LIBS += $$LINKAGE
diff --git a/private/qtjolie-branch/qtjolie/abstractadaptor.cpp b/private/qtjolie/qtjolie/abstractadaptor.cpp
similarity index 100%
rename from private/qtjolie-branch/qtjolie/abstractadaptor.cpp
rename to private/qtjolie/qtjolie/abstractadaptor.cpp
diff --git a/private/qtjolie-branch/qtjolie/abstractadaptor.h b/private/qtjolie/qtjolie/abstractadaptor.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/abstractadaptor.h
rename to private/qtjolie/qtjolie/abstractadaptor.h
diff --git a/private/qtjolie-branch/qtjolie/client.cpp b/private/qtjolie/qtjolie/client.cpp
similarity index 97%
rename from private/qtjolie-branch/qtjolie/client.cpp
rename to private/qtjolie/qtjolie/client.cpp
index 9f1a19d34..df03857a9 100644
--- a/private/qtjolie-branch/qtjolie/client.cpp
+++ b/private/qtjolie/qtjolie/client.cpp
@@ -26,9 +26,6 @@
 #include "pendingcall.h"
 #include "pendingreply.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 Client::Client(const QString &hostName, quint16 port)
diff --git a/private/qtjolie-branch/qtjolie/client.h b/private/qtjolie/qtjolie/client.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/client.h
rename to private/qtjolie/qtjolie/client.h
diff --git a/private/qtjolie-branch/qtjolie/client_p.h b/private/qtjolie/qtjolie/client_p.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/client_p.h
rename to private/qtjolie/qtjolie/client_p.h
diff --git a/private/qtjolie-branch/qtjolie/clientthread.cpp b/private/qtjolie/qtjolie/clientthread.cpp
similarity index 97%
rename from private/qtjolie-branch/qtjolie/clientthread.cpp
rename to private/qtjolie/qtjolie/clientthread.cpp
index 837827356..c165dcdbd 100644
--- a/private/qtjolie-branch/qtjolie/clientthread.cpp
+++ b/private/qtjolie/qtjolie/clientthread.cpp
@@ -26,9 +26,6 @@
 #include "message.h"
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 ClientThread::ClientThread(const QString &hostName, quint16 port, ClientPrivate *client)
diff --git a/private/qtjolie-branch/qtjolie/clientthread_p.h b/private/qtjolie/qtjolie/clientthread_p.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/clientthread_p.h
rename to private/qtjolie/qtjolie/clientthread_p.h
diff --git a/private/qtjolie-branch/qtjolie/fault.cpp b/private/qtjolie/qtjolie/fault.cpp
similarity index 96%
rename from private/qtjolie-branch/qtjolie/fault.cpp
rename to private/qtjolie/qtjolie/fault.cpp
index 7fcba74bf..5a213d46b 100644
--- a/private/qtjolie-branch/qtjolie/fault.cpp
+++ b/private/qtjolie/qtjolie/fault.cpp
@@ -24,9 +24,6 @@
 
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {
 
diff --git a/private/qtjolie-branch/qtjolie/fault.h b/private/qtjolie/qtjolie/fault.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/fault.h
rename to private/qtjolie/qtjolie/fault.h
diff --git a/private/qtjolie-branch/qtjolie/message.cpp b/private/qtjolie/qtjolie/message.cpp
similarity index 97%
rename from private/qtjolie-branch/qtjolie/message.cpp
rename to private/qtjolie/qtjolie/message.cpp
index 10633c65b..68d56c2e3 100644
--- a/private/qtjolie-branch/qtjolie/message.cpp
+++ b/private/qtjolie/qtjolie/message.cpp
@@ -24,9 +24,6 @@
 
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {
 
diff --git a/private/qtjolie-branch/qtjolie/message.h b/private/qtjolie/qtjolie/message.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/message.h
rename to private/qtjolie/qtjolie/message.h
diff --git a/private/qtjolie-branch/qtjolie/metaservice.cpp b/private/qtjolie/qtjolie/metaservice.cpp
similarity index 98%
rename from private/qtjolie-branch/qtjolie/metaservice.cpp
rename to private/qtjolie/qtjolie/metaservice.cpp
index deb06d9cf..ed4042117 100644
--- a/private/qtjolie-branch/qtjolie/metaservice.cpp
+++ b/private/qtjolie/qtjolie/metaservice.cpp
@@ -25,9 +25,6 @@
 #include "client.h"
 #include "message.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {
 
diff --git a/private/qtjolie-branch/qtjolie/metaservice.h b/private/qtjolie/qtjolie/metaservice.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/metaservice.h
rename to private/qtjolie/qtjolie/metaservice.h
diff --git a/private/qtjolie-branch/qtjolie/pendingcall.cpp b/private/qtjolie/qtjolie/pendingcall.cpp
similarity index 96%
rename from private/qtjolie-branch/qtjolie/pendingcall.cpp
rename to private/qtjolie/qtjolie/pendingcall.cpp
index 6f40fb2f1..dff30f9a7 100644
--- a/private/qtjolie-branch/qtjolie/pendingcall.cpp
+++ b/private/qtjolie/qtjolie/pendingcall.cpp
@@ -22,9 +22,6 @@
 #include "pendingcall_p.h"
 #include "pendingcallwatcher.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 PendingCall::PendingCall(const PendingCall &other)
diff --git a/private/qtjolie-branch/qtjolie/pendingcall.h b/private/qtjolie/qtjolie/pendingcall.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/pendingcall.h
rename to private/qtjolie/qtjolie/pendingcall.h
diff --git a/private/qtjolie-branch/qtjolie/pendingcall_p.h b/private/qtjolie/qtjolie/pendingcall_p.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/pendingcall_p.h
rename to private/qtjolie/qtjolie/pendingcall_p.h
diff --git a/private/qtjolie-branch/qtjolie/pendingcallwatcher.cpp b/private/qtjolie/qtjolie/pendingcallwatcher.cpp
similarity index 95%
rename from private/qtjolie-branch/qtjolie/pendingcallwatcher.cpp
rename to private/qtjolie/qtjolie/pendingcallwatcher.cpp
index 8786bae4d..250eb5c31 100644
--- a/private/qtjolie-branch/qtjolie/pendingcallwatcher.cpp
+++ b/private/qtjolie/qtjolie/pendingcallwatcher.cpp
@@ -22,9 +22,6 @@
 
 #include "pendingcall_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 PendingCallWatcher::PendingCallWatcher(const PendingCall &other, QObject *parent)
diff --git a/private/qtjolie-branch/qtjolie/pendingcallwatcher.h b/private/qtjolie/qtjolie/pendingcallwatcher.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/pendingcallwatcher.h
rename to private/qtjolie/qtjolie/pendingcallwatcher.h
diff --git a/private/qtjolie-branch/qtjolie/pendingreply.cpp b/private/qtjolie/qtjolie/pendingreply.cpp
similarity index 96%
rename from private/qtjolie-branch/qtjolie/pendingreply.cpp
rename to private/qtjolie/qtjolie/pendingreply.cpp
index 1411d7f38..d13e21755 100644
--- a/private/qtjolie-branch/qtjolie/pendingreply.cpp
+++ b/private/qtjolie/qtjolie/pendingreply.cpp
@@ -22,9 +22,6 @@
 
 #include "pendingcall_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 PendingReply::PendingReply()
diff --git a/private/qtjolie-branch/qtjolie/pendingreply.h b/private/qtjolie/qtjolie/pendingreply.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/pendingreply.h
rename to private/qtjolie/qtjolie/pendingreply.h
diff --git a/private/qtjolie-branch/qtjolie/server.cpp b/private/qtjolie/qtjolie/server.cpp
similarity index 100%
rename from private/qtjolie-branch/qtjolie/server.cpp
rename to private/qtjolie/qtjolie/server.cpp
diff --git a/private/qtjolie-branch/qtjolie/server.h b/private/qtjolie/qtjolie/server.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/server.h
rename to private/qtjolie/qtjolie/server.h
diff --git a/private/qtjolie-branch/qtjolie/server_p.h b/private/qtjolie/qtjolie/server_p.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/server_p.h
rename to private/qtjolie/qtjolie/server_p.h
diff --git a/private/qtjolie-branch/qtjolie/serverthread.cpp b/private/qtjolie/qtjolie/serverthread.cpp
similarity index 98%
rename from private/qtjolie-branch/qtjolie/serverthread.cpp
rename to private/qtjolie/qtjolie/serverthread.cpp
index ab6dac4f7..a609e2f36 100644
--- a/private/qtjolie-branch/qtjolie/serverthread.cpp
+++ b/private/qtjolie/qtjolie/serverthread.cpp
@@ -27,9 +27,6 @@
 #include "message.h"
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 using namespace Jolie;
 
 Q_DECLARE_METATYPE(QAbstractSocket*)
diff --git a/private/qtjolie-branch/qtjolie/serverthread_p.h b/private/qtjolie/qtjolie/serverthread_p.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/serverthread_p.h
rename to private/qtjolie/qtjolie/serverthread_p.h
diff --git a/private/qtjolie-branch/qtjolie/sodephelpers_p.h b/private/qtjolie/qtjolie/sodephelpers_p.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/sodephelpers_p.h
rename to private/qtjolie/qtjolie/sodephelpers_p.h
diff --git a/private/qtjolie-branch/qtjolie/value.cpp b/private/qtjolie/qtjolie/value.cpp
similarity index 98%
rename from private/qtjolie-branch/qtjolie/value.cpp
rename to private/qtjolie/qtjolie/value.cpp
index 190978c43..15e6c492e 100644
--- a/private/qtjolie-branch/qtjolie/value.cpp
+++ b/private/qtjolie/qtjolie/value.cpp
@@ -24,9 +24,6 @@
 
 #include "sodephelpers_p.h"
 
-#define QT_NO_CAST_FROM_ASCII
-#define QT_NO_CAST_TO_ASCII
-
 namespace Jolie
 {
 
diff --git a/private/qtjolie-branch/qtjolie/value.h b/private/qtjolie/qtjolie/value.h
similarity index 100%
rename from private/qtjolie-branch/qtjolie/value.h
rename to private/qtjolie/qtjolie/value.h
diff --git a/private/qtjolie-branch/tests/CMakeLists.txt b/private/qtjolie/tests/CMakeLists.txt
similarity index 100%
rename from private/qtjolie-branch/tests/CMakeLists.txt
rename to private/qtjolie/tests/CMakeLists.txt
diff --git a/private/qtjolie-branch/tests/calculatorclient.ol b/private/qtjolie/tests/calculatorclient.ol
similarity index 100%
rename from private/qtjolie-branch/tests/calculatorclient.ol
rename to private/qtjolie/tests/calculatorclient.ol
diff --git a/private/qtjolie-branch/tests/calculatorservice.cpp b/private/qtjolie/tests/calculatorservice.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/calculatorservice.cpp
rename to private/qtjolie/tests/calculatorservice.cpp
diff --git a/private/qtjolie-branch/tests/math.ol b/private/qtjolie/tests/math.ol
similarity index 100%
rename from private/qtjolie-branch/tests/math.ol
rename to private/qtjolie/tests/math.ol
diff --git a/private/qtjolie-branch/tests/printer.ol b/private/qtjolie/tests/printer.ol
similarity index 100%
rename from private/qtjolie-branch/tests/printer.ol
rename to private/qtjolie/tests/printer.ol
diff --git a/private/qtjolie-branch/tests/testfault.cpp b/private/qtjolie/tests/testfault.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/testfault.cpp
rename to private/qtjolie/tests/testfault.cpp
diff --git a/private/qtjolie-branch/tests/testhelpers.h b/private/qtjolie/tests/testhelpers.h
similarity index 100%
rename from private/qtjolie-branch/tests/testhelpers.h
rename to private/qtjolie/tests/testhelpers.h
diff --git a/private/qtjolie-branch/tests/testmessage.cpp b/private/qtjolie/tests/testmessage.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/testmessage.cpp
rename to private/qtjolie/tests/testmessage.cpp
diff --git a/private/qtjolie-branch/tests/testmetaservice.cpp b/private/qtjolie/tests/testmetaservice.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/testmetaservice.cpp
rename to private/qtjolie/tests/testmetaservice.cpp
diff --git a/private/qtjolie-branch/tests/testprinter.cpp b/private/qtjolie/tests/testprinter.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/testprinter.cpp
rename to private/qtjolie/tests/testprinter.cpp
diff --git a/private/qtjolie-branch/tests/testvalue.cpp b/private/qtjolie/tests/testvalue.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/testvalue.cpp
rename to private/qtjolie/tests/testvalue.cpp
diff --git a/private/qtjolie-branch/tests/trivialyahooclient.cpp b/private/qtjolie/tests/trivialyahooclient.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/trivialyahooclient.cpp
rename to private/qtjolie/tests/trivialyahooclient.cpp
diff --git a/private/qtjolie-branch/tests/visiondriver.cpp b/private/qtjolie/tests/visiondriver.cpp
similarity index 100%
rename from private/qtjolie-branch/tests/visiondriver.cpp
rename to private/qtjolie/tests/visiondriver.cpp
diff --git a/private/qtjolie-branch/tests/visiondriverwidget.ui b/private/qtjolie/tests/visiondriverwidget.ui
similarity index 100%
rename from private/qtjolie-branch/tests/visiondriverwidget.ui
rename to private/qtjolie/tests/visiondriverwidget.ui