remove unused package
fix package name
undo move
move class into internal package
Add new internal packages
Clean up warnings
Added JavaDoc
Reimplemented equals and hashCode so they match
Remove fixed todos