I have only kept in an include directory at the root the change in arrangement point location. This change also requires to use some special local includes in CMakeLists.txt files. I will do it in a subsequent commit.
Panagiotis Cheilaris