reorganisation of code within files