Moved the Main class to its own package.  Updated javaoc.