Merge update-project into master

Gets the gradle build going and restructures the repo to have the right structure for the gradle stuff.