bug 3 Rearrange project to work with Gradle. Justin