Major reorganisation of thesis structure.