Updated to new Gradle version
Model seperation, control/view yet to come.
Fixing Model seperation cherry-pick errors