Reorganize POMs with dedicated parent + BoM