Java 8 friendly, Formatted, Changed Package

Basically just did little Java 8 stuff, formatting, changed package.  Want to do more stuff over time in prep for a it being publicly usable.