Changed to Gradle project structure