Cleaned up code and added jar files