Cleaned Up Repository and Adopted Gradle Build System