diff --git a/include/f1x/aasdk b/include/f1x/aasdk
deleted file mode 120000
index b58b0fa..0000000
--- a/include/f1x/aasdk
+++ /dev/null
@@ -1 +0,0 @@
-../../../aasdk/include/aasdk/
\ No newline at end of file
diff --git a/include/f1x/openauto/autoapp/Projection/IAudioInput.hpp b/include/f1x/openauto/autoapp/Projection/IAudioInput.hpp
index 67c3373..a85d588 100644
--- a/include/f1x/openauto/autoapp/Projection/IAudioInput.hpp
+++ b/include/f1x/openauto/autoapp/Projection/IAudioInput.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include <memory>
-#include <f1x/aasdk/IO/Promise.hpp>
-#include <f1x/aasdk/Common/Data.hpp>
+#include <aasdk/IO/Promise.hpp>
+#include <aasdk/Common/Data.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/Projection/IAudioOutput.hpp b/include/f1x/openauto/autoapp/Projection/IAudioOutput.hpp
index c41de31..aaec03a 100644
--- a/include/f1x/openauto/autoapp/Projection/IAudioOutput.hpp
+++ b/include/f1x/openauto/autoapp/Projection/IAudioOutput.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include <memory>
-#include <f1x/aasdk/Messenger/Timestamp.hpp>
-#include <f1x/aasdk/Common/Data.hpp>
+#include <aasdk/Messenger/Timestamp.hpp>
+#include <aasdk/Common/Data.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/Projection/IBluetoothDevice.hpp b/include/f1x/openauto/autoapp/Projection/IBluetoothDevice.hpp
index 2d151fd..e5794cb 100644
--- a/include/f1x/openauto/autoapp/Projection/IBluetoothDevice.hpp
+++ b/include/f1x/openauto/autoapp/Projection/IBluetoothDevice.hpp
@@ -16,7 +16,7 @@
 *  along with openauto. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <f1x/aasdk/IO/Promise.hpp>
+#include <aasdk/IO/Promise.hpp>
 
 #pragma once
 
diff --git a/include/f1x/openauto/autoapp/Projection/IInputDevice.hpp b/include/f1x/openauto/autoapp/Projection/IInputDevice.hpp
index 663fbbd..3c9256a 100644
--- a/include/f1x/openauto/autoapp/Projection/IInputDevice.hpp
+++ b/include/f1x/openauto/autoapp/Projection/IInputDevice.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <QRect>
-#include <f1x/aasdk/IO/Promise.hpp>
+#include <aasdk/IO/Promise.hpp>
 #include <f1x/openauto/autoapp/Projection/InputEvent.hpp>
 
 namespace f1x
diff --git a/include/f1x/openauto/autoapp/Projection/IVideoOutput.hpp b/include/f1x/openauto/autoapp/Projection/IVideoOutput.hpp
index ef0f91c..0fdbe5b 100644
--- a/include/f1x/openauto/autoapp/Projection/IVideoOutput.hpp
+++ b/include/f1x/openauto/autoapp/Projection/IVideoOutput.hpp
@@ -22,7 +22,7 @@
 #include <QRect>
 #include <aasdk_proto/VideoFPSEnum.pb.h>
 #include <aasdk_proto/VideoResolutionEnum.pb.h>
-#include <f1x/aasdk/Common/Data.hpp>
+#include <aasdk/Common/Data.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/Projection/InputEvent.hpp b/include/f1x/openauto/autoapp/Projection/InputEvent.hpp
index fe22064..db47442 100644
--- a/include/f1x/openauto/autoapp/Projection/InputEvent.hpp
+++ b/include/f1x/openauto/autoapp/Projection/InputEvent.hpp
@@ -20,7 +20,7 @@
 
 #include <aasdk_proto/ButtonCodeEnum.pb.h>
 #include <aasdk_proto/TouchActionEnum.pb.h>
-#include <f1x/aasdk/IO/Promise.hpp>
+#include <aasdk/IO/Promise.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/Projection/SequentialBuffer.hpp b/include/f1x/openauto/autoapp/Projection/SequentialBuffer.hpp
index 153b687..179aabe 100644
--- a/include/f1x/openauto/autoapp/Projection/SequentialBuffer.hpp
+++ b/include/f1x/openauto/autoapp/Projection/SequentialBuffer.hpp
@@ -21,7 +21,7 @@
 #include <QIODevice>
 #include <mutex>
 #include <boost/circular_buffer.hpp>
-#include <f1x/aasdk/Common/Data.hpp>
+#include <aasdk/Common/Data.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp b/include/f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp
index 7bfe7a3..8fc9b15 100644
--- a/include/f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp
+++ b/include/f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp
@@ -19,10 +19,10 @@
 #pragma once
 
 #include <boost/asio.hpp>
-#include <f1x/aasdk/Transport/ITransport.hpp>
-#include <f1x/aasdk/Channel/Control/IControlServiceChannel.hpp>
-#include <f1x/aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp>
-#include <f1x/aasdk/Channel/AV/VideoServiceChannel.hpp>
+#include <aasdk/Transport/ITransport.hpp>
+#include <aasdk/Channel/Control/IControlServiceChannel.hpp>
+#include <aasdk/Channel/Control/IControlServiceChannelEventHandler.hpp>
+#include <aasdk/Channel/AV/VideoServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
 #include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
diff --git a/include/f1x/openauto/autoapp/Service/AndroidAutoEntityFactory.hpp b/include/f1x/openauto/autoapp/Service/AndroidAutoEntityFactory.hpp
index b9fed4f..9c45e27 100644
--- a/include/f1x/openauto/autoapp/Service/AndroidAutoEntityFactory.hpp
+++ b/include/f1x/openauto/autoapp/Service/AndroidAutoEntityFactory.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <boost/asio.hpp>
-#include <f1x/aasdk/Transport/ITransport.hpp>
+#include <aasdk/Transport/ITransport.hpp>
 #include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
 #include <f1x/openauto/autoapp/Service/IAndroidAutoEntityFactory.hpp>
 #include <f1x/openauto/autoapp/Service/IServiceFactory.hpp>
diff --git a/include/f1x/openauto/autoapp/Service/AudioInputService.hpp b/include/f1x/openauto/autoapp/Service/AudioInputService.hpp
index c8e56c2..6b1dfba 100644
--- a/include/f1x/openauto/autoapp/Service/AudioInputService.hpp
+++ b/include/f1x/openauto/autoapp/Service/AudioInputService.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/Channel/AV/AVInputServiceChannel.hpp>
+#include <aasdk/Channel/AV/AVInputServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 #include <f1x/openauto/autoapp/Projection/IAudioInput.hpp>
 
diff --git a/include/f1x/openauto/autoapp/Service/AudioService.hpp b/include/f1x/openauto/autoapp/Service/AudioService.hpp
index 034ddec..51e5427 100644
--- a/include/f1x/openauto/autoapp/Service/AudioService.hpp
+++ b/include/f1x/openauto/autoapp/Service/AudioService.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <f1x/aasdk/Channel/AV/IAudioServiceChannel.hpp>
-#include <f1x/aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp>
+#include <aasdk/Channel/AV/IAudioServiceChannel.hpp>
+#include <aasdk/Channel/AV/IAudioServiceChannelEventHandler.hpp>
 #include <f1x/openauto/autoapp/Projection/IAudioOutput.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 
diff --git a/include/f1x/openauto/autoapp/Service/BluetoothService.hpp b/include/f1x/openauto/autoapp/Service/BluetoothService.hpp
index 27b46d8..b5d8619 100644
--- a/include/f1x/openauto/autoapp/Service/BluetoothService.hpp
+++ b/include/f1x/openauto/autoapp/Service/BluetoothService.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp>
+#include <aasdk/Channel/Bluetooth/BluetoothServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Projection/IBluetoothDevice.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 
diff --git a/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityEventHandler.hpp b/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityEventHandler.hpp
index 648d125..2ae816d 100644
--- a/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityEventHandler.hpp
+++ b/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityEventHandler.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/Error/Error.hpp>
+#include <aasdk/Error/Error.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityFactory.hpp b/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityFactory.hpp
index 97b958b..5a174fd 100644
--- a/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityFactory.hpp
+++ b/include/f1x/openauto/autoapp/Service/IAndroidAutoEntityFactory.hpp
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include <f1x/aasdk/TCP/ITCPEndpoint.hpp>
-#include <f1x/aasdk/USB/IAOAPDevice.hpp>
+#include <aasdk/TCP/ITCPEndpoint.hpp>
+#include <aasdk/USB/IAOAPDevice.hpp>
 #include <f1x/openauto/autoapp/Service/IAndroidAutoEntity.hpp>
 
 namespace f1x
diff --git a/include/f1x/openauto/autoapp/Service/IPinger.hpp b/include/f1x/openauto/autoapp/Service/IPinger.hpp
index d345ed3..c283c88 100644
--- a/include/f1x/openauto/autoapp/Service/IPinger.hpp
+++ b/include/f1x/openauto/autoapp/Service/IPinger.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/IO/Promise.hpp>
+#include <aasdk/IO/Promise.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/Service/IServiceFactory.hpp b/include/f1x/openauto/autoapp/Service/IServiceFactory.hpp
index 6049d9d..e7d724a 100644
--- a/include/f1x/openauto/autoapp/Service/IServiceFactory.hpp
+++ b/include/f1x/openauto/autoapp/Service/IServiceFactory.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/Messenger/IMessenger.hpp>
+#include <aasdk/Messenger/IMessenger.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 
 namespace f1x
diff --git a/include/f1x/openauto/autoapp/Service/InputService.hpp b/include/f1x/openauto/autoapp/Service/InputService.hpp
index 03ed01b..0a1ee00 100644
--- a/include/f1x/openauto/autoapp/Service/InputService.hpp
+++ b/include/f1x/openauto/autoapp/Service/InputService.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <aasdk_proto/ButtonCodeEnum.pb.h>
-#include <f1x/aasdk/Channel/Input/InputServiceChannel.hpp>
+#include <aasdk/Channel/Input/InputServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 #include <f1x/openauto/autoapp/Projection/IInputDevice.hpp>
 #include <f1x/openauto/autoapp/Projection/IInputDeviceEventHandler.hpp>
diff --git a/include/f1x/openauto/autoapp/Service/MediaAudioService.hpp b/include/f1x/openauto/autoapp/Service/MediaAudioService.hpp
index bbd1414..0d25046 100644
--- a/include/f1x/openauto/autoapp/Service/MediaAudioService.hpp
+++ b/include/f1x/openauto/autoapp/Service/MediaAudioService.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/Messenger/IMessenger.hpp>
+#include <aasdk/Messenger/IMessenger.hpp>
 #include <f1x/openauto/autoapp/Service/AudioService.hpp>
 
 namespace f1x
diff --git a/include/f1x/openauto/autoapp/Service/SensorService.hpp b/include/f1x/openauto/autoapp/Service/SensorService.hpp
index 93d96d6..66494fb 100644
--- a/include/f1x/openauto/autoapp/Service/SensorService.hpp
+++ b/include/f1x/openauto/autoapp/Service/SensorService.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <gps.h>
-#include <f1x/aasdk/Channel/Sensor/SensorServiceChannel.hpp>
+#include <aasdk/Channel/Sensor/SensorServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 
 namespace f1x
diff --git a/include/f1x/openauto/autoapp/Service/SpeechAudioService.hpp b/include/f1x/openauto/autoapp/Service/SpeechAudioService.hpp
index d71f1a9..62d3199 100644
--- a/include/f1x/openauto/autoapp/Service/SpeechAudioService.hpp
+++ b/include/f1x/openauto/autoapp/Service/SpeechAudioService.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/Messenger/IMessenger.hpp>
+#include <aasdk/Messenger/IMessenger.hpp>
 #include <f1x/openauto/autoapp/Service/AudioService.hpp>
 
 namespace f1x
diff --git a/include/f1x/openauto/autoapp/Service/SystemAudioService.hpp b/include/f1x/openauto/autoapp/Service/SystemAudioService.hpp
index af775b2..c0090ed 100644
--- a/include/f1x/openauto/autoapp/Service/SystemAudioService.hpp
+++ b/include/f1x/openauto/autoapp/Service/SystemAudioService.hpp
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <f1x/aasdk/Messenger/IMessenger.hpp>
+#include <aasdk/Messenger/IMessenger.hpp>
 #include <f1x/openauto/autoapp/Service/AudioService.hpp>
 
 namespace f1x
diff --git a/include/f1x/openauto/autoapp/Service/VideoService.hpp b/include/f1x/openauto/autoapp/Service/VideoService.hpp
index 391e1bc..24a8bfb 100644
--- a/include/f1x/openauto/autoapp/Service/VideoService.hpp
+++ b/include/f1x/openauto/autoapp/Service/VideoService.hpp
@@ -19,8 +19,8 @@
 #pragma once
 
 #include <memory>
-#include <f1x/aasdk/Channel/AV/VideoServiceChannel.hpp>
-#include <f1x/aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp>
+#include <aasdk/Channel/AV/VideoServiceChannel.hpp>
+#include <aasdk/Channel/AV/IVideoServiceChannelEventHandler.hpp>
 #include <f1x/openauto/autoapp/Projection/IVideoOutput.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 
diff --git a/include/f1x/openauto/autoapp/Service/WifiService.hpp b/include/f1x/openauto/autoapp/Service/WifiService.hpp
index f9aefcf..47f630c 100644
--- a/include/f1x/openauto/autoapp/Service/WifiService.hpp
+++ b/include/f1x/openauto/autoapp/Service/WifiService.hpp
@@ -21,7 +21,7 @@
 #include <f1x/openauto/autoapp/Configuration/IConfiguration.hpp>
 #include <f1x/openauto/autoapp/Service/IService.hpp>
 #include <boost/asio/io_service.hpp>
-#include <f1x/aasdk/Messenger/IMessenger.hpp>
+#include <aasdk/Messenger/IMessenger.hpp>
 
 namespace f1x
 {
diff --git a/include/f1x/openauto/autoapp/UI/ConnectDialog.hpp b/include/f1x/openauto/autoapp/UI/ConnectDialog.hpp
index f97d5fa..5d39d7a 100644
--- a/include/f1x/openauto/autoapp/UI/ConnectDialog.hpp
+++ b/include/f1x/openauto/autoapp/UI/ConnectDialog.hpp
@@ -3,8 +3,8 @@
 #include <QDialog>
 #include <QStringListModel>
 #include <QKeyEvent>
-#include <f1x/aasdk/TCP/ITCPEndpoint.hpp>
-#include <f1x/aasdk/TCP/ITCPWrapper.hpp>
+#include <aasdk/TCP/ITCPEndpoint.hpp>
+#include <aasdk/TCP/ITCPWrapper.hpp>
 #include <f1x/openauto/autoapp/Configuration/IRecentAddressesList.hpp>
 
 namespace Ui {
diff --git a/src/autoapp/Service/AndroidAutoEntity.cpp b/src/autoapp/Service/AndroidAutoEntity.cpp
index 7a4985e..cea74e5 100644
--- a/src/autoapp/Service/AndroidAutoEntity.cpp
+++ b/src/autoapp/Service/AndroidAutoEntity.cpp
@@ -16,7 +16,7 @@
 *  along with openauto. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <f1x/aasdk/Channel/Control/ControlServiceChannel.hpp>
+#include <aasdk/Channel/Control/ControlServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp>
 #include <f1x/openauto/Common/Log.hpp>
 
diff --git a/src/autoapp/Service/AndroidAutoEntityFactory.cpp b/src/autoapp/Service/AndroidAutoEntityFactory.cpp
index d833250..9f0ace8 100644
--- a/src/autoapp/Service/AndroidAutoEntityFactory.cpp
+++ b/src/autoapp/Service/AndroidAutoEntityFactory.cpp
@@ -16,14 +16,14 @@
 *  along with openauto. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <f1x/aasdk/USB/AOAPDevice.hpp>
-#include <f1x/aasdk/Transport/SSLWrapper.hpp>
-#include <f1x/aasdk/Transport/USBTransport.hpp>
-#include <f1x/aasdk/Transport/TCPTransport.hpp>
-#include <f1x/aasdk/Messenger/Cryptor.hpp>
-#include <f1x/aasdk/Messenger/MessageInStream.hpp>
-#include <f1x/aasdk/Messenger/MessageOutStream.hpp>
-#include <f1x/aasdk/Messenger/Messenger.hpp>
+#include <aasdk/USB/AOAPDevice.hpp>
+#include <aasdk/Transport/SSLWrapper.hpp>
+#include <aasdk/Transport/USBTransport.hpp>
+#include <aasdk/Transport/TCPTransport.hpp>
+#include <aasdk/Messenger/Cryptor.hpp>
+#include <aasdk/Messenger/MessageInStream.hpp>
+#include <aasdk/Messenger/MessageOutStream.hpp>
+#include <aasdk/Messenger/Messenger.hpp>
 #include <f1x/openauto/autoapp/Service/AndroidAutoEntityFactory.hpp>
 #include <f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp>
 #include <f1x/openauto/autoapp/Service/Pinger.hpp>
diff --git a/src/autoapp/Service/MediaAudioService.cpp b/src/autoapp/Service/MediaAudioService.cpp
index b754d21..b4bf247 100644
--- a/src/autoapp/Service/MediaAudioService.cpp
+++ b/src/autoapp/Service/MediaAudioService.cpp
@@ -16,7 +16,7 @@
 *  along with openauto. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <f1x/aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
+#include <aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/MediaAudioService.hpp>
 
 namespace f1x
diff --git a/src/autoapp/Service/ServiceFactory.cpp b/src/autoapp/Service/ServiceFactory.cpp
index 9ef2e70..82aa5c2 100644
--- a/src/autoapp/Service/ServiceFactory.cpp
+++ b/src/autoapp/Service/ServiceFactory.cpp
@@ -18,9 +18,9 @@
 
 #include <QApplication>
 #include <QScreen>
-#include <f1x/aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
-#include <f1x/aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
-#include <f1x/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
+#include <aasdk/Channel/AV/MediaAudioServiceChannel.hpp>
+#include <aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
+#include <aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/ServiceFactory.hpp>
 #include <f1x/openauto/autoapp/Service/VideoService.hpp>
 #include <f1x/openauto/autoapp/Service/MediaAudioService.hpp>
diff --git a/src/autoapp/Service/SpeechAudioService.cpp b/src/autoapp/Service/SpeechAudioService.cpp
index 5930095..47e9006 100644
--- a/src/autoapp/Service/SpeechAudioService.cpp
+++ b/src/autoapp/Service/SpeechAudioService.cpp
@@ -16,7 +16,7 @@
 *  along with openauto. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <f1x/aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
+#include <aasdk/Channel/AV/SpeechAudioServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/SpeechAudioService.hpp>
 
 namespace f1x
diff --git a/src/autoapp/Service/SystemAudioService.cpp b/src/autoapp/Service/SystemAudioService.cpp
index 0998615..33f5f94 100644
--- a/src/autoapp/Service/SystemAudioService.cpp
+++ b/src/autoapp/Service/SystemAudioService.cpp
@@ -16,7 +16,7 @@
 *  along with openauto. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <f1x/aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
+#include <aasdk/Channel/AV/SystemAudioServiceChannel.hpp>
 #include <f1x/openauto/autoapp/Service/SystemAudioService.hpp>
 
 namespace f1x