Updated all files in a single .jar file.

Cleaned up the  files so they all show up in a single .jar file