Updated directory structure for the new Gradle system