Cleaned up main class.  Fixed classpath bug.

Signed-off-by: Matt Hoover <the.one.eleven@gmail.com>