General clean up.  Moved tests into appropriate packages.  Made several cleanup suggestions from intellij.