Cleanup
Fixed classpath in manifest