Initial tidying an factoring out of versioning