bump version and re-order Versioning system