Moved over to a gradle setup