Assorted changes - see description

Moved the files into a package, removed the Test.java file, added
comments to both files, moved driver functionality out of main and into
the actual class