Update the package parsing so it allows annotations and javadoc.  Also
include some unit tests.