Undo earlier POM formatting changes
Introduce generation gap to strategies, separating building of base and manual classes wherever possible. Highlighted circular builder deps with 'g-gap'