Major reorganisation. Renamed many methods. Updated tests and
documentation.