Fixes to file/namespace problems

Also, bump version