Fixing package names to conform to convention.

Apprenons is bound to the domain name lake-hammond.co.nz. The
Java naming convention stipulates that the hyphen should be
replaced with an underscore.