renamed classes + added dependencies in POM