New version number
Re-organisation of includes
A bunch of reorganising and comments