Revamp Versioning System

Change-Id: I705a9739d67946c3fa020c49743605f83c012323