Update Maven POM to reflect new package structure