Organise pom structure into corrected hierarchy

No match.