Updated Gradle build and cleaned NPM packages