Reorganisation of source code