Some slight reorganisation and some prepatory work on the tokeniser