diff --git a/Ruqola.pro b/Ruqola.pro
index 011ad320..bc264060 100644
--- a/Ruqola.pro
+++ b/Ruqola.pro
@@ -1,16 +1,16 @@
 TEMPLATE = app
 
 QT += widgets gui core qml quick websockets
 
-HEADERS += messagemodel.h roommodel.h ddpclient.h userdata.h rocketchatbackend.h
-SOURCES += main.cpp messagemodel.cpp roommodel.cpp ddpclient.cpp userdata.cpp rocketchatbackend.cpp
+HEADERS += src/messagemodel.h src/roommodel.h src/ddpclient.h src/userdata.h src/rocketchatbackend.h
+SOURCES += main.cpp src/messagemodel.cpp src/roommodel.cpp src/ddpclient.cpp src/userdata.cpp src/rocketchatbackend.cpp
 
 RESOURCES += qml.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 # QML_IMPORT_PATH = 
 
 # Default rules for deployment.
 include(deployment.pri)
 
 DISTFILES +=
diff --git a/main.cpp b/main.cpp
index 99bd795f..cc68ba8a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,37 +1,37 @@
 #include <QApplication>
 #include <QtQml>
 // #include <QtQml/QQmlApplicationEngine>
 // #include <QtQml/QQmlContext>
 
-#include "roommodel.h"
-#include "rocketchatbackend.h"
-#include "userdata.h"
+#include "src/roommodel.h"
+#include "src/rocketchatbackend.h"
+#include "src/userdata.h"
 
 #include <QDebug>
 #include <QtCore/QJsonDocument>
 
 
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     QCoreApplication::setOrganizationName("KDE");
     QCoreApplication::setOrganizationDomain("kde.org");
     QCoreApplication::setApplicationName("Ruqola");
 //     DDPClient client();
     
     qmlRegisterSingletonType<UserData>("KDE.Ruqola.UserData", 1, 0, "UserData", userdata_singletontype_provider);
 
     qmlRegisterType<MessageModel>("KDE.Ruqola.Models", 1, 0, "MessageModel");
     qmlRegisterType<RoomModel>("KDE.Ruqola.Models", 1, 0, "RoomModel");
 
     RocketChatBackend c;
     
     QQmlApplicationEngine engine;
 //     QQmlContext *ctxt = engine.rootContext();
 //     
 //     ctxt->setContextProperty("myModel", UserData::instance()->messageList());
 //     ctxt->setContextProperty("roomModel", UserData::instance()->roomModel());
     engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
 
     return app.exec();
 }
diff --git a/qml.qrc b/qml.qrc
index bace6ade..1006adca 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -1,13 +1,12 @@
 <RCC>
     <qresource prefix="/">
         <file>Desktop.qml</file>
         <file>JSONListModel.qml</file>
         <file>RoomModel.qml</file>
         <file>jsonpath.js</file>
         <file>main.qml</file>
         <file>Message.qml</file>
-        <file>Android.qml</file>
         <file>Login.qml</file>
         <file>marked.js</file>
     </qresource>
 </RCC>
diff --git a/ddpclient.cpp b/src/ddpclient.cpp
similarity index 100%
rename from ddpclient.cpp
rename to src/ddpclient.cpp
diff --git a/ddpclient.h b/src/ddpclient.h
similarity index 100%
rename from ddpclient.h
rename to src/ddpclient.h
diff --git a/messagemodel.cpp b/src/messagemodel.cpp
similarity index 100%
rename from messagemodel.cpp
rename to src/messagemodel.cpp
diff --git a/messagemodel.h b/src/messagemodel.h
similarity index 100%
rename from messagemodel.h
rename to src/messagemodel.h
diff --git a/rocketchatbackend.cpp b/src/rocketchatbackend.cpp
similarity index 100%
rename from rocketchatbackend.cpp
rename to src/rocketchatbackend.cpp
diff --git a/rocketchatbackend.h b/src/rocketchatbackend.h
similarity index 100%
rename from rocketchatbackend.h
rename to src/rocketchatbackend.h
diff --git a/roommodel.cpp b/src/roommodel.cpp
similarity index 100%
rename from roommodel.cpp
rename to src/roommodel.cpp
diff --git a/roommodel.h b/src/roommodel.h
similarity index 100%
rename from roommodel.h
rename to src/roommodel.h
diff --git a/userdata.cpp b/src/userdata.cpp
similarity index 100%
rename from userdata.cpp
rename to src/userdata.cpp
diff --git a/userdata.h b/src/userdata.h
similarity index 100%
rename from userdata.h
rename to src/userdata.h