diff --git a/.gitattributes b/.gitattributes
index 09d5e2adb0e4dee14485691bf2c0c5bce942275d..9d938e2e0aac871f2e3ceea76ad20f3c83eee967 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -793,7 +793,6 @@ CEP/GSM/src/gsmutils.py -text
 CEP/GSM/src/lsm.py -text
 CEP/GSM/src/ms3_script.py -text
 CEP/GSM/src/msssprocess.py -text
-CEP/Imager/ImageLofar/src/addImagingInfo -text
 CEP/Imager/LofarFT/TODO.txt -text
 CEP/Imager/LofarFT/include/LofarFT/LofarATerm.h -text
 CEP/Imager/LofarFT/include/LofarFT/LofarCFDefs.h -text
@@ -808,6 +807,7 @@ CEP/Imager/LofarFT/src/LofarCFStore.cc -text
 CEP/Imager/LofarFT/src/LofarCubeSkyEquation.cc -text
 CEP/Imager/LofarFT/src/LofarVisibilityResampler.cc -text
 CEP/Imager/LofarFT/src/LofarVisibilityResamplerBase.cc -text
+CEP/Imager/LofarFT/src/addImagingInfo -text
 CEP/Imager/MWControl/test/tMWControl.in_mpi_out3 -text
 CEP/Imager/MWControl/test/tMWControl.in_mpi_out4 -text
 CEP/Imager/MWControl/test/tMWControl.in_ms -text
diff --git a/CEP/Imager/CMakeLists.txt b/CEP/Imager/CMakeLists.txt
index 37314bba2ef9ceb29179bbe2c7407cf9a17db275..dd2d83eb340b03149495bb53527d415e5ca197ec 100644
--- a/CEP/Imager/CMakeLists.txt
+++ b/CEP/Imager/CMakeLists.txt
@@ -6,4 +6,3 @@ lofar_add_package(MWImager)
 #lofar_add_package(LofarGridder)
 lofar_add_package(ASKAPsoft)
 lofar_add_package(LofarFT)
-lofar_add_package(ImageLofar)
diff --git a/CEP/Imager/LofarFT/TODO.txt b/CEP/Imager/LofarFT/TODO.txt
index 8643f443141705ecb542140ebe8a233d05ae9dfa..5acccb61671c6281322cba3d5898bab92d5d005a 100644
--- a/CEP/Imager/LofarFT/TODO.txt
+++ b/CEP/Imager/LofarFT/TODO.txt
@@ -4,7 +4,6 @@ TODO
 Things that still have to be done (in arbitrary order).
 
 * Code clean-up.
-* Remove unnecessary copy-ing of arrays in LofarConvolutionFunction.
 * Proper support for MS with multiple channels / bands (MF in FTMachine).
     - How to determine reference frequencies?
     - LofarATerm needs to correct the A-term for the response at the phase center for each channel.
@@ -15,11 +14,11 @@ Things that still have to be done (in arbitrary order).
 * Allow a facet to be put at the location of a corrupting source.
 * MFS from Sanjay (?)
 * Parallelisation
-* Gridder optimisation
 * Make sure convolution functions are not too large
 * Use WEIGHT_SPECTRUM
 * Support for multiple image channels
-* Store average PB, etc. in properly named files
 * Distributed weighting and gridding (multiple subbands on different nodes)
 * Grid PSF and data simultaneously (to reduce data access and conv.func. calculation)
+* Get rid of multiple times writing avgpb and spheriod_cut_im for csclean
+* Implement (de)gridding on GPU
 
diff --git a/CEP/Imager/LofarFT/src/CMakeLists.txt b/CEP/Imager/LofarFT/src/CMakeLists.txt
index 462d30cd5ddd87c01184e203637d5486abc24c00..1846507abf79b385b7850cf490753873b3b5977a 100644
--- a/CEP/Imager/LofarFT/src/CMakeLists.txt
+++ b/CEP/Imager/LofarFT/src/CMakeLists.txt
@@ -23,3 +23,7 @@ lofar_add_library(lofarft
 lofar_add_bin_program(versionlofarft versionlofarft.cc)
 lofar_add_bin_program(awimager awimager.cc)
 lofar_add_bin_program(makefftwisdom2d makefftwisdom2d.cc)
+
+install(PROGRAMS
+  addImagingInfo
+  DESTINATION bin)
diff --git a/CEP/Imager/ImageLofar/src/addImagingInfo b/CEP/Imager/LofarFT/src/addImagingInfo
similarity index 100%
rename from CEP/Imager/ImageLofar/src/addImagingInfo
rename to CEP/Imager/LofarFT/src/addImagingInfo