Organise pom structure into corrected hierarchy