updated to the correct model, added server fetching, removed unused javadoc and test jars from libs folder