[NUCCORE-1229] Refactor enhancement contract classes so that they are in
own self-contained package