Modified POM (no parent POMs anymore that's why), renamed; some clean-up…