Lots of stuff

Re-named classes etc