Re orginisation of code files