diff --git a/hive/libhive/libhive.pro b/hive/libhive/libhive.pro
index 4c958c6c..4496e005 100644
--- a/hive/libhive/libhive.pro
+++ b/hive/libhive/libhive.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += widgets declarative qml quick network dbus
+QT       += network declarative
 
 TARGET = libhive
 TEMPLATE = lib
diff --git a/hive/libhive/server.cpp b/hive/libhive/server.cpp
index eb6a76cc..4e817e54 100644
--- a/hive/libhive/server.cpp
+++ b/hive/libhive/server.cpp
@@ -1,8 +1,4 @@
 #include "server.h"
-
-#include <QNetworkInterface>
-#include <QTcpServer>
-#include <QTcpSocket>
 #include <QDebug>
 
 Server::Server(QObject *parent) :
diff --git a/hive/libhive/server.h b/hive/libhive/server.h
index ec23484d..d7d8f205 100644
--- a/hive/libhive/server.h
+++ b/hive/libhive/server.h
@@ -2,7 +2,9 @@
 #define SERVER_H
 
 #include <QObject>
+#include <QNetworkInterface>
 #include <QTcpServer>
+#include <QTcpSocket>
 
 class Server : public QObject
 {
diff --git a/hive/server/hive/hive.pro b/hive/server/hive/hive.pro
index 11846786..676fbedf 100644
--- a/hive/server/hive/hive.pro
+++ b/hive/server/hive/hive.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core
+QT       += core network
 
 QT       -= gui
 
@@ -17,12 +17,14 @@ TEMPLATE = app
 SOURCES += main.cpp \
     hivecore.cpp
 
+
+
+HEADERS += \
+    hivecore.h
+
 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../libhive/release/ -llibhive
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../libhive/debug/ -llibhive
 else:unix: LIBS += -L$$OUT_PWD/../../libhive/ -llibhive
 
 INCLUDEPATH += $$PWD/../../libhive
 DEPENDPATH += $$PWD/../../libhive
-
-HEADERS += \
-    hivecore.h
diff --git a/hive/server/hive/hivecore.h b/hive/server/hive/hivecore.h
index ac18fdb1..8d7760c9 100644
--- a/hive/server/hive/hivecore.h
+++ b/hive/server/hive/hivecore.h
@@ -2,7 +2,7 @@
 #define HIVECORE_H
 
 #include <QObject>
-#include <libhive/server.h>
+#include "server.h"
 
 class HiveCore : public QObject
 {
@@ -11,7 +11,7 @@ public:
     explicit HiveCore(QObject *parent = 0);
     
 private:
-    Server m_server;
+    Server *m_server;
 
 signals:
     
diff --git a/hive/server/hive_pi/hive_pi.pro b/hive/server/hive_pi/hive_pi.pro
index 68629337..5af4aaa2 100644
--- a/hive/server/hive_pi/hive_pi.pro
+++ b/hive/server/hive_pi/hive_pi.pro
@@ -4,20 +4,29 @@
 #
 #-------------------------------------------------
 
-QT       += core
+QT       += core network
 
 QT       -= gui
 
 TARGET = hive_pi
-target.path = /usr/bin
 
 CONFIG   += console
 CONFIG   -= app_bundle
 
+target.path = /usr/bin
 INSTALLS += target
 
 
 TEMPLATE = app
 
 
-SOURCES += main.cpp
+SOURCES += main.cpp \
+    hivecore.cpp
+
+unix:!macx: LIBS += -L$$OUT_PWD/../../libhive/ -llibhive
+
+INCLUDEPATH += $$PWD/../../libhive
+DEPENDPATH += $$PWD/../../libhive
+
+HEADERS += \
+    hivecore.h
diff --git a/hive/server/hive_pi/hivecore.cpp b/hive/server/hive_pi/hivecore.cpp
new file mode 100644
index 00000000..b2f460db
--- /dev/null
+++ b/hive/server/hive_pi/hivecore.cpp
@@ -0,0 +1,7 @@
+#include "hivecore.h"
+
+HiveCore::HiveCore(QObject *parent) :
+    QObject(parent)
+{
+    m_server = new Server(this);
+}
diff --git a/hive/server/hive_pi/hivecore.h b/hive/server/hive_pi/hivecore.h
new file mode 100644
index 00000000..8d7760c9
--- /dev/null
+++ b/hive/server/hive_pi/hivecore.h
@@ -0,0 +1,22 @@
+#ifndef HIVECORE_H
+#define HIVECORE_H
+
+#include <QObject>
+#include "server.h"
+
+class HiveCore : public QObject
+{
+    Q_OBJECT
+public:
+    explicit HiveCore(QObject *parent = 0);
+    
+private:
+    Server *m_server;
+
+signals:
+    
+public slots:
+    
+};
+
+#endif // HIVECORE_H