Reorganisation of code.