diff --git a/StationResponse/src/AntennaField.cc b/AntennaField.cc
similarity index 100%
rename from StationResponse/src/AntennaField.cc
rename to AntennaField.cc
diff --git a/StationResponse/include/StationResponse/AntennaField.h b/AntennaField.h
similarity index 100%
rename from StationResponse/include/StationResponse/AntennaField.h
rename to AntennaField.h
diff --git a/StationResponse/src/AntennaFieldHBA.cc b/AntennaFieldHBA.cc
similarity index 100%
rename from StationResponse/src/AntennaFieldHBA.cc
rename to AntennaFieldHBA.cc
diff --git a/StationResponse/include/StationResponse/AntennaFieldHBA.h b/AntennaFieldHBA.h
similarity index 100%
rename from StationResponse/include/StationResponse/AntennaFieldHBA.h
rename to AntennaFieldHBA.h
diff --git a/StationResponse/src/AntennaFieldLBA.cc b/AntennaFieldLBA.cc
similarity index 100%
rename from StationResponse/src/AntennaFieldLBA.cc
rename to AntennaFieldLBA.cc
diff --git a/StationResponse/include/StationResponse/AntennaFieldLBA.h b/AntennaFieldLBA.h
similarity index 100%
rename from StationResponse/include/StationResponse/AntennaFieldLBA.h
rename to AntennaFieldLBA.h
diff --git a/StationResponse/src/AntennaModelHBA.cc b/AntennaModelHBA.cc
similarity index 100%
rename from StationResponse/src/AntennaModelHBA.cc
rename to AntennaModelHBA.cc
diff --git a/StationResponse/include/StationResponse/AntennaModelHBA.h b/AntennaModelHBA.h
similarity index 100%
rename from StationResponse/include/StationResponse/AntennaModelHBA.h
rename to AntennaModelHBA.h
diff --git a/StationResponse/src/AntennaModelLBA.cc b/AntennaModelLBA.cc
similarity index 100%
rename from StationResponse/src/AntennaModelLBA.cc
rename to AntennaModelLBA.cc
diff --git a/StationResponse/include/StationResponse/AntennaModelLBA.h b/AntennaModelLBA.h
similarity index 100%
rename from StationResponse/include/StationResponse/AntennaModelLBA.h
rename to AntennaModelLBA.h
diff --git a/StationResponse/include/StationResponse/Constants.h b/Constants.h
similarity index 100%
rename from StationResponse/include/StationResponse/Constants.h
rename to Constants.h
diff --git a/ElementResponse/src/DefaultCoeffHBA.cc b/DefaultCoeffHBA.cc
similarity index 100%
rename from ElementResponse/src/DefaultCoeffHBA.cc
rename to DefaultCoeffHBA.cc
diff --git a/ElementResponse/src/DefaultCoeffLBA.cc b/DefaultCoeffLBA.cc
similarity index 100%
rename from ElementResponse/src/DefaultCoeffLBA.cc
rename to DefaultCoeffLBA.cc
diff --git a/StationResponse/src/DualDipoleAntenna.cc b/DualDipoleAntenna.cc
similarity index 100%
rename from StationResponse/src/DualDipoleAntenna.cc
rename to DualDipoleAntenna.cc
diff --git a/StationResponse/include/StationResponse/DualDipoleAntenna.h b/DualDipoleAntenna.h
similarity index 100%
rename from StationResponse/include/StationResponse/DualDipoleAntenna.h
rename to DualDipoleAntenna.h
diff --git a/ElementResponse/src/ElementResponse.cc b/ElementResponse.cc
similarity index 100%
rename from ElementResponse/src/ElementResponse.cc
rename to ElementResponse.cc
diff --git a/ElementResponse/include/ElementResponse/ElementResponse.h b/ElementResponse.h
similarity index 100%
rename from ElementResponse/include/ElementResponse/ElementResponse.h
rename to ElementResponse.h
diff --git a/ElementResponse/include/ElementResponse/CMakeLists.txt b/ElementResponse/include/ElementResponse/CMakeLists.txt
deleted file mode 100644
index a97059ef3720c45a058d22dad5e7024dda6488ac..0000000000000000000000000000000000000000
--- a/ElementResponse/include/ElementResponse/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id$
-
-# Create symbolic link to include directory.
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
-
-# Install header files.
-install(FILES
-  ElementResponse.h
-  DESTINATION include/${PACKAGE_NAME})
diff --git a/ElementResponse/src/CMakeLists.txt b/ElementResponse/src/CMakeLists.txt
deleted file mode 100644
index fbbf6cf0cc590054491f91aa4ef16c2b2732ccf5..0000000000000000000000000000000000000000
--- a/ElementResponse/src/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id: CMakeLists.txt 18775 2011-09-06 13:36:45Z zwieten $
-
-include(LofarPackageVersion)
-
-lofar_add_library(elementresponse
-  Package__Version.cc
-  ElementResponse.cc)
diff --git a/StationResponse/src/ITRFDirection.cc b/ITRFDirection.cc
similarity index 100%
rename from StationResponse/src/ITRFDirection.cc
rename to ITRFDirection.cc
diff --git a/StationResponse/include/StationResponse/ITRFDirection.h b/ITRFDirection.h
similarity index 100%
rename from StationResponse/include/StationResponse/ITRFDirection.h
rename to ITRFDirection.h
diff --git a/StationResponse/src/LofarMetaDataUtil.cc b/LofarMetaDataUtil.cc
similarity index 100%
rename from StationResponse/src/LofarMetaDataUtil.cc
rename to LofarMetaDataUtil.cc
diff --git a/StationResponse/include/StationResponse/LofarMetaDataUtil.h b/LofarMetaDataUtil.h
similarity index 100%
rename from StationResponse/include/StationResponse/LofarMetaDataUtil.h
rename to LofarMetaDataUtil.h
diff --git a/StationResponse/src/MathUtil.cc b/MathUtil.cc
similarity index 100%
rename from StationResponse/src/MathUtil.cc
rename to MathUtil.cc
diff --git a/StationResponse/include/StationResponse/MathUtil.h b/MathUtil.h
similarity index 100%
rename from StationResponse/include/StationResponse/MathUtil.h
rename to MathUtil.h
diff --git a/StationResponse/src/Station.cc b/Station.cc
similarity index 100%
rename from StationResponse/src/Station.cc
rename to Station.cc
diff --git a/StationResponse/include/StationResponse/Station.h b/Station.h
similarity index 100%
rename from StationResponse/include/StationResponse/Station.h
rename to Station.h
diff --git a/StationResponse/include/StationResponse/CMakeLists.txt b/StationResponse/include/StationResponse/CMakeLists.txt
deleted file mode 100644
index b4dc8dff3c3c708ec21a53a78bc8c087148742f7..0000000000000000000000000000000000000000
--- a/StationResponse/include/StationResponse/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-# Create symbolic link to include directory.
-execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}/include/${PACKAGE_NAME})
-
-# Install header files.
-install(FILES
-  AntennaField.h
-  AntennaFieldHBA.h
-  AntennaFieldLBA.h
-  AntennaModelHBA.h
-  AntennaModelLBA.h
-  Constants.h
-  DualDipoleAntenna.h
-  ITRFDirection.h
-  LofarMetaDataUtil.h
-  MathUtil.h
-  Station.h
-  TileAntenna.h
-  Types.h
-  DESTINATION include/${PACKAGE_NAME})
diff --git a/StationResponse/src/CMakeLists.txt b/StationResponse/src/CMakeLists.txt
deleted file mode 100644
index e31a7a54574b0e908c6ba2760cf49626696f1850..0000000000000000000000000000000000000000
--- a/StationResponse/src/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-
-include(LofarPackageVersion)
-
-lofar_add_library(stationresponse
-  Package__Version.cc
-  AntennaField.cc
-  AntennaFieldHBA.cc
-  AntennaFieldLBA.cc
-  AntennaModelHBA.cc
-  AntennaModelLBA.cc
-  DualDipoleAntenna.cc
-  ITRFDirection.cc
-  LofarMetaDataUtil.cc
-  MathUtil.cc
-  Station.cc
-  TileAntenna.cc
-  Types.cc)
-
-lofar_add_bin_program(makeresponseimage makeresponseimage.cc)
diff --git a/StationResponse/src/TileAntenna.cc b/TileAntenna.cc
similarity index 100%
rename from StationResponse/src/TileAntenna.cc
rename to TileAntenna.cc
diff --git a/StationResponse/include/StationResponse/TileAntenna.h b/TileAntenna.h
similarity index 100%
rename from StationResponse/include/StationResponse/TileAntenna.h
rename to TileAntenna.h
diff --git a/StationResponse/src/Types.cc b/Types.cc
similarity index 100%
rename from StationResponse/src/Types.cc
rename to Types.cc
diff --git a/StationResponse/include/StationResponse/Types.h b/Types.h
similarity index 100%
rename from StationResponse/include/StationResponse/Types.h
rename to Types.h
diff --git a/ElementResponse/src/convert_coeff.py b/convert_coeff.py
similarity index 100%
rename from ElementResponse/src/convert_coeff.py
rename to convert_coeff.py
diff --git a/ElementResponse/src/element_beam_HBA.coeff b/element_beam_HBA.coeff
similarity index 100%
rename from ElementResponse/src/element_beam_HBA.coeff
rename to element_beam_HBA.coeff
diff --git a/ElementResponse/src/element_beam_LBA.coeff b/element_beam_LBA.coeff
similarity index 100%
rename from ElementResponse/src/element_beam_LBA.coeff
rename to element_beam_LBA.coeff
diff --git a/StationResponse/src/makeresponseimage.cc b/makeresponseimage.cc
similarity index 100%
rename from StationResponse/src/makeresponseimage.cc
rename to makeresponseimage.cc