Alterations for easier JAR distribution
Alterations for easier JAR distribution