Updated POM structure and dependencies