Remove dependencies from lib/ and add to pom.xml