Updating Project Structure

Updating Project Structure for Gradle