Update upstream with libs folder containing jars, and removing unused classes.

NOTE: For the jars to be recognized you have to:
right click jar -> build path... -> add to build path