diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a87125afd52b8ce92cd8524d711f8d81f883ed2..18309141bd713551d3e6c9d2aa565b8651e8256a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ project(lofarbeam)
 add_subdirectory(external)
 
 add_subdirectory(lobes)
+add_subdirectory(oskar)
 
 cmake_policy(SET CMP0074 NEW)
 
@@ -36,8 +37,6 @@ add_library(stationresponse SHARED
   DualDipoleAntenna.cc
   ElementResponseModel.cc
   HamakerElementResponse.cc
-  OSKARElementResponse.cc
-  oskar/oskar_evaluate_dipole_pattern.cc
   ITRFConverter.cc
   ITRFDirection.cc
   LofarMetaDataUtil.cc
@@ -51,6 +50,8 @@ set_target_properties(stationresponse PROPERTIES VERSION 3)
 
 target_link_libraries(stationresponse ${CASACORE_LIBRARIES})
 
+target_link_libraries(stationresponse oskar)
+
 install (TARGETS stationresponse DESTINATION lib)
 
 install (FILES
diff --git a/Station.cc b/Station.cc
index 2f50116cbc33f8d29175dc13c34d6cc9080c03a4..5a1c98b3715aebde353fe0070ef51af7b0c0da4f 100644
--- a/Station.cc
+++ b/Station.cc
@@ -24,7 +24,7 @@
 #include "MathUtil.h"
 
 #include "HamakerElementResponse.h"
-#include "OSKARElementResponse.h"
+#include "oskar/OSKARElementResponse.h"
 #include "DualDipoleAntenna.h"
 #include "TileAntenna.h"
 
diff --git a/oskar/CMakeLists.txt b/oskar/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ba078dd552c5e5bb0eab6dbb81afd1eda2dbe632
--- /dev/null
+++ b/oskar/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_library(oskar SHARED
+    OSKARElementResponse.cc
+    oskar_evaluate_dipole_pattern.cc)
diff --git a/OSKARElementResponse.cc b/oskar/OSKARElementResponse.cc
similarity index 91%
rename from OSKARElementResponse.cc
rename to oskar/OSKARElementResponse.cc
index a1d22eaad1da7586b3e36c836a374a74e0514b07..390c05e93a8a24da631f05f5370a587cca4b14e6 100644
--- a/OSKARElementResponse.cc
+++ b/oskar/OSKARElementResponse.cc
@@ -1,7 +1,7 @@
 #include "OSKARElementResponse.h"
 
-#include "oskar/oskar_vector_types.h"
-#include "oskar/oskar_helper.h"
+#include "oskar_vector_types.h"
+#include "oskar_helper.h"
 
 #include <iostream>
 
diff --git a/OSKARElementResponse.h b/oskar/OSKARElementResponse.h
similarity index 90%
rename from OSKARElementResponse.h
rename to oskar/OSKARElementResponse.h
index 0f6125ebd9e42417eac8b3eb1bbb363ae2ab70c1..5fa123897c0036c79a6dc6112fded18c187b41f5 100644
--- a/OSKARElementResponse.h
+++ b/oskar/OSKARElementResponse.h
@@ -1,4 +1,4 @@
-#include "ElementResponse.h"
+#include "../ElementResponse.h"
 
 #include <memory>