fix package on BitInput/OutputStreams
refactor country service
refactor test to not use TestUtils
fix synchronization to match Effective Java
Crash with sane message on corrupt DB (this seems to catch the most common cause of DB corruption)