Updated for new file format and build.gradle