Reorganisation for ease of packaging and new release 1.0.1