Merge "updating gradle build to match directory"