Slight reorganisation, working on GUI