Polish
A few more package tweaks

Improve package structure and include package-info javadoc.