Reorganisation in code