Reorganisation of the source code