Reorganisation of code structure