Reorganisation of files, and additional comnplex math methods