Initial commit, refactor to try and get a working build for with worldcoinj