Removed v1 code, started v2, and moved to Gradle