Change versioning to seperate file
Further fixes for versioning