diff --git a/.gitattributes b/.gitattributes
index 972eda9c040534e0d7869b006aa747e4f589df3d..aa5734fe4af9447fd22ce9c50321cca811f5e6a2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -856,15 +856,10 @@ JAVA/MAC/jRSP/.cvsignore -text
 LCS/AMC/AMCImpl/src/AMCServer.cc -text
 LCS/AMC/amc_main_classes.png -text
 LCS/AMC/amc_package.png -text
-LCS/ApplCommon/include/ApplCommon/AntennaField.h -text
 LCS/ApplCommon/include/ApplCommon/StationDatatypes.h -text
-LCS/ApplCommon/src/AntennaField.cc -text
 LCS/ApplCommon/src/StationDatatypes.cc -text
 LCS/ApplCommon/test/tAntField.in_de -text
 LCS/ApplCommon/test/tAntField.in_rs -text
-LCS/ApplCommon/test/tAntennaField.cc -text
-LCS/ApplCommon/test/tAntennaField.in -text
-LCS/ApplCommon/test/tAntennaField.sh -text
 LCS/ApplCommon/test/tAntennaUse.cc -text
 LCS/ApplCommon/test/tAntennaUse.in_1 -text
 LCS/ApplCommon/test/tAntennaUse.in_2 -text
@@ -1070,9 +1065,14 @@ LCU/StationTest/xc_160_setup.sh eol=lf
 LCU/StationTest/xc_160_verify.sh eol=lf
 LCU/StationTest/xc_200_setup.sh eol=lf
 LCU/StationTest/xc_200_verify.sh eol=lf
+MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h -text
+MAC/APL/APLCommon/src/AntennaField.cc -text
 MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream
 MAC/APL/APLCommon/test/ControllerProtMenu.cc -text
 MAC/APL/APLCommon/test/ControllerProtMenu.h -text
+MAC/APL/APLCommon/test/tAntennaField.cc -text
+MAC/APL/APLCommon/test/tAntennaField.in -text
+MAC/APL/APLCommon/test/tAntennaField.sh -text
 MAC/APL/APLCommon/test/tParentControl.cc -text
 MAC/APL/APLCommon/test/tParentControl.h -text
 MAC/APL/APLCommon/test/tParentControl.log_prop -text
diff --git a/LCS/ApplCommon/src/CMakeLists.txt b/LCS/ApplCommon/src/CMakeLists.txt
index b98b8fa899c3d872d9bfab625fb38092c5c37693..b5f596ea6096113e02712c01f5d7cfd664f8c43c 100644
--- a/LCS/ApplCommon/src/CMakeLists.txt
+++ b/LCS/ApplCommon/src/CMakeLists.txt
@@ -5,7 +5,6 @@ include(LofarPackageVersion)
 lofar_add_library(applcommon
   Package__Version.cc
   AntField.cc
-  AntennaField.cc
   AntennaSets.cc
   Observation.cc
   StationConfig.cc
diff --git a/LCS/ApplCommon/test/CMakeLists.txt b/LCS/ApplCommon/test/CMakeLists.txt
index 7537906ae799fd129a8a5d39e2c97516080b5d00..0db098b7d0708a15e57570503eec1efc7d3884fc 100644
--- a/LCS/ApplCommon/test/CMakeLists.txt
+++ b/LCS/ApplCommon/test/CMakeLists.txt
@@ -3,6 +3,5 @@
 include(LofarCTest)
 
 lofar_add_test(tAntField tAntField.cc)
-lofar_add_test(tAntennaField tAntennaField.cc)
 lofar_add_test(tAntennaSet tAntennaSet.cc)
 lofar_add_test(tObservation tObservation.cc)
diff --git a/LCS/ApplCommon/include/ApplCommon/AntennaField.h b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
similarity index 100%
rename from LCS/ApplCommon/include/ApplCommon/AntennaField.h
rename to MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
diff --git a/LCS/ApplCommon/src/AntennaField.cc b/MAC/APL/APLCommon/src/AntennaField.cc
similarity index 99%
rename from LCS/ApplCommon/src/AntennaField.cc
rename to MAC/APL/APLCommon/src/AntennaField.cc
index 389607d1edeb47d9432eeaa519dd462103ebaeb7..645fd708e93361d07d9dea7bbf34c5198a4f53b0 100644
--- a/LCS/ApplCommon/src/AntennaField.cc
+++ b/MAC/APL/APLCommon/src/AntennaField.cc
@@ -24,7 +24,7 @@
 #include <lofar_config.h>
 
 //# Includes
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
 #include <Common/LofarLogger.h>
 
 using namespace blitz;
diff --git a/MAC/APL/APLCommon/src/CMakeLists.txt b/MAC/APL/APLCommon/src/CMakeLists.txt
index e9023faab3c1ffd5f6f55de9707fed6039ce0eaa..834db3dd4d958c1bc32b25cb5a6619669ffd35cc 100644
--- a/MAC/APL/APLCommon/src/CMakeLists.txt
+++ b/MAC/APL/APLCommon/src/CMakeLists.txt
@@ -11,6 +11,7 @@ lofar_add_library(aplcommon
   Package__Version.cc
   StartDaemon_Protocol.cc
   Controller_Protocol.cc
+  AntennaField.cc
   APLUtilities.cc
   ControllerDefines.cc
   CTState.cc
diff --git a/MAC/APL/APLCommon/test/CMakeLists.txt b/MAC/APL/APLCommon/test/CMakeLists.txt
index 9af2ba2dc193637b8c51e50e65879464b820beb6..f7aec8dbd25631ca114318491517354d2a838ea8 100644
--- a/MAC/APL/APLCommon/test/CMakeLists.txt
+++ b/MAC/APL/APLCommon/test/CMakeLists.txt
@@ -6,6 +6,7 @@ include(LofarCTest)
 include_directories(${PACKAGE_BINARY_DIR}/src)
 
 lofar_add_test(tControllerDefines tControllerDefines.cc)
+lofar_add_test(tAntennaField tAntennaField.cc)
 lofar_add_test(tAPLUtilities tAPLUtilities.cc)
 lofar_add_test(tbitsetUtil tbitsetUtil.cc)
 lofar_add_test(tOutOfBand tOutOfBand.cc)
diff --git a/LCS/ApplCommon/test/tAntennaField.cc b/MAC/APL/APLCommon/test/tAntennaField.cc
similarity index 98%
rename from LCS/ApplCommon/test/tAntennaField.cc
rename to MAC/APL/APLCommon/test/tAntennaField.cc
index 497e7b8ab4db0d2568a414450b019f18642fff7c..db80c0572c2970f416caa708983828be8d857868 100644
--- a/LCS/ApplCommon/test/tAntennaField.cc
+++ b/MAC/APL/APLCommon/test/tAntennaField.cc
@@ -26,7 +26,7 @@
 //# Includes
 #include <Common/LofarLogger.h>
 #include <Common/StreamUtil.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
 
 using namespace LOFAR;
 
diff --git a/LCS/ApplCommon/test/tAntennaField.in b/MAC/APL/APLCommon/test/tAntennaField.in
similarity index 100%
rename from LCS/ApplCommon/test/tAntennaField.in
rename to MAC/APL/APLCommon/test/tAntennaField.in
diff --git a/LCS/ApplCommon/test/tAntennaField.sh b/MAC/APL/APLCommon/test/tAntennaField.sh
similarity index 100%
rename from LCS/ApplCommon/test/tAntennaField.sh
rename to MAC/APL/APLCommon/test/tAntennaField.sh
diff --git a/LCS/ApplCommon/test/tAntennaField.stdout b/MAC/APL/APLCommon/test/tAntennaField.stdout
similarity index 100%
rename from LCS/ApplCommon/test/tAntennaField.stdout
rename to MAC/APL/APLCommon/test/tAntennaField.stdout
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
index 27e5a71069f14ecc6176be93f98ad056951d64ed..8701cc89fbccb7276ffba0b8cbdd72497838614e 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
@@ -25,7 +25,7 @@
 #include <Common/LofarLocators.h>
 #include <Common/LofarConstants.h>
 #include <ApplCommon/AntennaSets.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
 #include <APL/RTCCommon/PSAccess.h>		// ParameterSet macros
 #include <APL/RSP_Protocol/RSP_Protocol.ph>
 
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
index b87f3bfaf80b8d6b1b284863848ff500a84bf851..83ad0185b1103c152cd4e804756bdd447af84a2e 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
@@ -29,11 +29,11 @@
 #include <Common/ParameterSet.h>
 #include <Common/StreamUtil.h>
 #include <ApplCommon/StationConfig.h>
-#include <ApplCommon/AntennaField.h>
 #include <ApplCommon/AntennaSets.h>
 
 #include <MACIO/MACServiceInfo.h>
 
+#include <APL/APLCommon/AntennaField.h>
 #include <APL/IBS_Protocol/IBS_Protocol.ph>
 #include <APL/RSP_Protocol/RSP_Protocol.ph>
 #include <APL/CAL_Protocol/CAL_Protocol.ph>
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
index 1811ed2bb611e28c1a06fea308c93e6c57bdc6c6..ec52d06ec823d612492cfdbac966faf247df134c 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
@@ -26,8 +26,8 @@
 #include <Common/LofarLocators.h>
 #include <Common/lofar_complex.h>
 #include <Common/StringUtil.h>
-#include <ApplCommon/AntennaField.h>
 #include <ApplCommon/AntennaSets.h>
+#include <APL/APLCommon/AntennaField.h>
 #include <APL/CAL_Protocol/SpectralWindow.h>
 
 #include <blitz/array.h>
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
index 1e79fdc15b3265bfb5b542f5ae2cf7eea57bba34..f4511a5de9fd2bd83d8de51315b58357d5bf6470 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
@@ -26,8 +26,8 @@
 #include <Common/LofarLocators.h>
 #include <Common/lofar_complex.h>
 #include <Common/StringUtil.h>
-#include <ApplCommon/AntennaField.h>
 #include <ApplCommon/AntennaSets.h>
+#include <APL/APLCommon/AntennaField.h>
 #include <APL/CAL_Protocol/SpectralWindow.h>
 
 #include <blitz/array.h>
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.h b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
index 33d93e5aed740bea8679098c9b6dac99eac031a8..6647a4c50e9d16c823c3522a307bec1c9ecc7064 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
@@ -27,7 +27,7 @@
 #include <Common/LofarLogger.h>
 #include <Common/lofar_string.h>
 #include <Common/lofar_datetime.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
 
 //# ACC Includes
 #include <Common/ParameterSet.h>
diff --git a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
index 2ce05000f989f9c97e0b6354e169c7ba0c5bb6a4..a14f3c7e6b3860e5feb5742b36c5e4a94697af36 100644
--- a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
+++ b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
@@ -33,7 +33,7 @@
 #include <Common/LofarTypes.h>
 #include <Common/lofar_bitset.h>
 #include <Common/LofarConstants.h>
-#include <ApplCommon/AntennaField.h>
+#include <APL/APLCommon/AntennaField.h>
 
 namespace LOFAR {
   namespace VHECR {