Initial cleanup to better conform with git versioning