Changed to Gradle System. Still introducing the other classes