Versioning, renaming and minor clean up