Proper versioning of assemblies

And some cleanup.