Changed build.gradle to recognize the new file structure