Simplify POM Hierarchy

Signed-off-by: slanau <silu@gft.com>