more POM restructuring and fixes