Gradle Wrapper ignored by GIT
Minor enhancements
Abstraction fixup
Changed packages and related definitions