Reverting to original files.
Fixed classpath.
Merged frostwire-common changes