Organising and making preps for next version