Moved over to using Gradle for builds, and some project tidy up