Reconfigured structure to use Gradle