Re-organising and adding documentation