Project upgrades

Moved the project around to be compatible with Gradle.