Update cabal files

Update repository urls, use subdir property for haddock-library and use
a separate versioning scheme for haddock-library in preparation for release.