General clean-up and add jar files.