Reorganisation of the code structure